First some simple questions: Does your TPS now go click-click just as you move it away from the stop position and back to the rest position? -if not then the adjustment is still out or the switch has internal grunge (may need replacement). You must not turn the TPS switch so far that it affects the throttle stop position -just adjust it a hair past the click. Is there a little slack in the accelerator cable? -you don't want the cable to govern the idle stop position.

It sounds like you're no longer getting trouble codes and now have everything half back to normal except for the rough idle during warmup. First off, I'd go check the plugs to make sure they aren't fouled after running around in limp home mode. Another thing to be suspicious of is old/dirty/arcing spark plug wires. The next step is to remove the throttle body from the intake manifold and clean it out thoroughly on the bench with carb cleaner/solvent. Pay particular attention to the edge of the throttle plate and the surrounding area in the throat. Make sure the orifices are clean, especially the pin sized hole. At the same time you should give the PCV system a thorough clean out starting with the flame trap (below the #2 & #3 intake runners) especially making sure that the small hose to the throttle body is completely clear and the nipples on either end are clear (carefully ream out all the carbon deposits as needed). When replacing, check/adjust the throttle plate stop screw, the threaded linkage rod, the throttle cable and lastly the TPS switch. Refer to the 700-900 FAQ Feature Section (or search the archives) on this site for more details on setting up the throttle body on a B230F. Lastly, I'd run a few tankfuls with a quality fuel injector cleaner additive along with a few good hours of high-rev mountain driving to help burn off internal deposits in/on the injectors and valves. You may need to clean residue off the plugs after doing this.

I hope something in the above helps you.
--
Dave -not to be confused with a real expert, just goofing around at this