I replaced my thermostat with a 180º unit. And if i'm in traffic it still runs right up to almost overheat. Should I replace my water pump next? It's been in the 90's here lately. I am also going to buy a JET fan switch to keep that lower as well any ideas on how I can test it as well. Thanks in advance.