Re: water pump
In case you didn't already see this :
Place each bolt as you remove it into the corresponding hole in the new pump.
When the old pump is removed, swap the bolts back to it.
Then install the new pump using the bolts from the same location.