When you click on links to various merchants on this site and make a purchase, this can result in this site earning a commission. Affiliate programs and affiliations include, but are not limited to, the eBay Partner Network.
I'd get a modified oil pump put in there while you're at it. The oil pump is more likely to cause problems than the water pump, but if you can stretch to a good quality one, then replace it aswell. There's also the Thermostat.