Re: changed the water pump for fellow XF owner
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. )