if you have not found it yet check out the second g section on the t4r.org forum
over all good group of folks with some good info
I got some good answers for my 95 with the 3.0 in it.
I finally sold mine with a hundred and 80 k on it with blown headgasket, screwy front end blown power steering pump and pissing oil everywhere for a thousand bucks.
it still refused to die all the day.
I was having similar rpm problems to you as well as gettign up to opperating temp but then again it was running on its dented good looks and endless amounts of stop leak
I changed out the thermostat and that mostly fixed the idel problem and the warming up problem. cheap part but a real pain to change out die to the way the rad is set up and all the plumbing is run.
I was happy to get the money I put into the brand new tires back out of it when it finally left. I wont even mention the other 5 k I sank into it over a year and a half trying to get it up to par.
In my Mind I was going to keep it forever and jack it up, rip part and fix the whole thing and have an awesome back county buggy. When the rear window broke in the down postion I was over it and off she went to some highschooler to beat on since the boss could not even use it for the really bad snow days in the winters anymore.
Alas. I still miss that hunk of crap.
best of luck