[Eyegore]

For the water pump, can you wiggle the fan blades, that is usaully a sign that it is bad, or coolant dripping out from the weep hole on the bottom of the pump itself.
Does it overheat when ideling for a period of time or only when driving it? I had this problem and the radiator was 30% restricted, put in a new rad, no more over heating.

Hope you find the problem soon.