helidriver

Just rebuilt an extra engine I picked up a couple years ago from ground up. 22re. Swapped my tired old one for it in my 87 runner Sr 4x4. Got it fired up and mostly tuned then took it to toyota to fine tune it.
The guy there said it's timed, valves adjusted, vacuum hoses good, no leaks, tps adjusted.... BUT it's idling at about 1000 no matter what I do, it's rough acceleration but cruises fine, and it surges from time to time at idle.
This sounds like tps right? Any other thoughts of what it could be. Drove it 2k since the rebuild ever towed a uhaul with about 2k from vegas to Portland and it's not leaking a thing? Did the Toyota guy screw up the tps adjustment? He acknowledged the problems and blamed it on old gas from while I was rebuilding varnishing the cylinders but that sounds stupid with what these trucks can do.