Todd,  Further to the EWP saga, do you remember what capacity your pump is?  Is it the 130 L/Min or the larger 150 l/min?  The more I look the more impressed I get.  Looking at my installation I have heaps of room to mount the pump basically "under" the engine, which finally gives me a water pump as low as possible rather than the existing top of the engine.  Neil.