yes. new oil and water pumps are a good idea. I always get new ones when doing the t-chain. Just good preventive maintenance. Thinking new timing cover as well. Look at teds site at http://www.engnbldr.com/. He can get the whole shebang for ya at a good price.