To follow up to this thread, my CEL has gone off and been off for over a 1,000 miles since this thread was started. The only thing that has changed was... I have moved to FL and I am getting gas at this one store that in my opinion has really good gas. When I would visit down here and fill up my FJ with this gas I could drive probably 30-40 miles further on my tank than I could if I filled up at other places. (I can't think of the brand of gas but I will drive by tomorrow and update the thread)
I didn't change that O2 sensor, clean the MAF, or do anything else.
I am about to change the oil, filters, plugs and plug tubes, and when I have the engine compartment open I will clean the MAF, but so far everything is going really good. Idle is rock steady, good power. I hate to say it, but I am thinking it may have been the Costco gas in NC that was giving my problems. I love Costco so I hate saying that...
Steve