Have you thought about machining the engine side of the water pump? I know guys that have run mounting plates on the front of their engines and corrected alignment by machining the water pump.