On the oil pump; I'd take a look at it while you are in there for the water pump. It comes right off the front of the engine and you can inspect it then. The shop manual gives the wear limits. Mine showed almost zero wear at 100K so I put it back. I wouldn't replace it without first looking at it.