There are several potential issues in the overheating problem. So, you may have cat problems with the heat issue. (not my first thought but sort of fits the description) Do you still have the fan shroud on? (some people remove this item for unknown reason) Jeep had a TSB about heating issues...