I don't think the O2 sensor is causing your idle problem.
Might just need that, TOO.
Did you clean the IACV and check the fast idle valve, like I said?
Also, try spraying carb/injector cleaner on the vaccuum lines and listening for idle surges.