Just for future reference, the part that was leaking was the heater control valve. Replaced it, and it seems to be holding it's temperature ok.
I didn't relize what temperature the electric fan comes on. It was kicking on just above the 210 mark, and would cycle on and off, so it appears that the over heating problem may have been taken care of.