Sorry, Typo; TPS. The TPS is on the throttle body, with a 4 wire connector. The MAP sensor is on the firewall above the valve cover, it has a three wire connector.

It sounds like the jeep will do it warm or cold. That rules out a bad O2 sensor. A bad O2 sensor would only do it hot.
I'd start with the TPS and the MAP sensors, then go from there. <img src="/forums/images/graemlins/kewl.gif" alt="" />

91 YJ
2 Seater Sand Rail
Handfull of other fun toys...
And a brand new, spit shined, B.S.
Oh, and a job to boot.