My 94 YJ had very much the same issue....
I had upgraded (or maybe actually a down grade) to a flowcool water pump and IIRC a colder hi-flow t-stat (not sure what temp), but anyway... took out for test drive and temp gauge started going way high. Stopped let it cool down, etc. Did all the...