I'm glad you are changing out the wires, they look unhappy. I would guess the heater is fine and the problem is really just the wires (and maybe that thermostat which you should switch) and just fully replace them (run them all the way back). I didn't get a fan, didn't think of it at the time...