If you are unsure about the waterpump then replace it, but make sure it has the metal impeller. You can buy another temp switch, a 80/88 one with an 80C low temp thermostat (and o ring) and 2 bottles of water wetter. Then you can get rid of your stock fan and have a solid cooling system.