I think I ought to just replace the water pump gasket and get it over with. I'm going to order the 41mm water pump wrench this time (was a PITA last time...someone said it wasn't needed, and although I got it done without it, it probably took me 1 hr + to get the adjustment correct). Will pick up a gasket for a few bucks at the auto parts store, and hopefully on saturday get it all done.

Probably just leave all the other parts as they are newish. The water/coolant won't hurt them or the bearings will it?

Can anyone recommend a good way to clean the gasket surface? It's so hard to get in there, or even see in there, with the engine in the car.