I had a similar problem on my dads 96. Changed EVERYTHING!!!!! water pump, thermostat,tune up, radiator and cap, flushed,,yada yada yada......come to find out the crank position sensor was "weak". causing the jeep to run very lean and overheat at idle or low speeds. I fought it for 3 months!!! Just an FYI and maybe another place to look. They are about $60-80 depending where you get it from.