Could there be something in the oil pump? The oil pump is 1 to 1 ratio if I remember. As far as the water pump, I'm thinking it's 1 to 1 but really it's been too long. This is a long shot, but if you have a way to turn the engine over fast, you could see if you get a clunk or tapping noise...