If you have the time, the water pump is pretty doable. If you have all 13mm bolts on your water pump, the Snap-On FLXM13 wobble extension will be a god send for getting at some of the harder-to-reach bolts.

And don't forget to replace the short bypass hose between the head and the pump.

Anthony