Had a fellow XF owner tell me that her water pump pulley was very wobbly anda bunch of fluid was resting in the belly pan. I seen the pulley assembly was very wobbly indeed and when i took the water pump off the blades on the backside of the pump marred the surface up pretty bad. I took Woody's advice and traced the replacement water pump on cardbooard and stuck each bolt thru the cardboard as i removed them from the block. Theres no way anyone would remember where each one goes as they are all different lengths and some are M6 and some are M8. I wrote 18 bolts on the cardboard but theres actually 19 bolts. I'm sure someone would have pointed that out. Heres a few pics.

 

Excellent idea!

 

How many miles on the engine, and was the bad WP the original OEM?

 

Good idea, but I find it easier to just place the bolts into the new water pump as you remove them, then once the old pump is off, swap them back. Then do the same as you install the new pump.
( no drawing skills ( which I lack ) involved. )