When you say high, how high is it getting? Could be that you have 1 fan out, or that one or both fans aren't going high speed when the a/c is on. If a fan is seized, it not only will not help with cooling, but will cause resistance to the airflow. Check to make sure you don't have a bag or something stuck to the front of your condenser. Also, is the a/c running good, or does it cut out sometimes (besides when you get on the gas)?
Before I did any cooling mods, mis-summer with the a/c on... my OEM temp gauge would get about 3/4 (up from 1/2 way for normal driving). Mine still gets hot, but only gets up to 220* (just over 1/2 way on the oem gauge), where it used to get up to around 235-240* (3/4).
For the waterpump... get a long screwdriver (unless you have a stethoscope) and listen to the pump and also to the idler pulley housing. When I last replaced my pump... the reducing cone had come loose and the idler was rattling. From the pump it sounded like a swirling sound.... like a metal disc spinning on lubricated (coolant) metal.