rough idle and surging
 

Hi, im new to this site. I have a 92 4runner 3.0L 4x4 manual trans. I picked this truck up relatively cheap but it has an issue with high idle. I've checked for vacuum leaks with no luck so I moved onto the Throttle position sensor. It has been replaced without solving the issue. I checked my timing to see it was WAY advanced so I corrected the timing per manufacturers specs. all be it my idle set screw is all the way in, the idle dipped to it recommended 800 rpm speed. Now my truck suffers from a hesitation on the accelerator and surging going up hills or rpms, above 3k.
Its possible my tps is set incorrectly which in theory would cause this problem. The issue is that I do have it set at its most accurate values according to the bently auto manual, yet to me seem a bit far off. Ideas? Any advice is greatly appreciated.
Thanks!