[arctan]

If you do the water pump I'd advise an oem gasket set. I bought an aftermarket pump in a hurry, and used the aftermarket supplied gaskets/seals. Two weeks later they leaked- upper seal. Refitted it with oem and now sorted. The oem seal/s were much more flexible! (I appreciate that the pump needs upward pressure when refitting).
Elsewhere on this forum I've seen pictures of steering pump brackets where the mounting holes have gone oval...