What you need to do has already been said - go back to a 195 t-stat. Like many others, I too have tried the absolute stupidity of a 185, even a 160, t-stat, only to find it does squat. Guess those brainiacs at Jeep actually knew what they were doing when they used a 195 to begin with. Secondly, get rid of the "high flow" water pump. Again, it does crap. You made need a new one, but certainly not some fancy-shmancy high flow. The 3 core 2" radiator isn't a bad idea. Keep that. The coolant will cycle through it slower after going back to a 195 and stock water pump, allowing it to cool more before going back into the engine. While you're taking off the 180 t0stat and water pump, go ahead and do a full system flush, including the heater core and block. Like others have said, check the fan clutch. Going all electric is nice, but not necessary. A new clutch and a even a better fan can do wonders for you.