djrolo...you might try some silicone spray on your accessory belts, if that quiets the noise down it is the belts...if that does not quiet the belts then I would look at the idler pulley bearings and the tensioner bearings. If you have replaced the water pump there really is no other place the noise can be coming from unless you got a bad pump.

I think one of the problems is these cars are so well insulated we do not often get out of the car with the engine running to hear these warning signs until it is too late. I think it pays to do a "walk around" the car every so often just listening for stuff you would not hear from inside the car...open the hood and listen too. Often your car is warning you it is developing a problem...we just don't listen.