Cleaning the MAF and IAC didn't fix it although I would've been more surprised if it did. Problem is now getting worse it will now stall at stoplights and it has started missing on light throttle even. I'm going to try my other MAF, but a stuck or sticking injector definitely seems like it would fit the bill as well and I'm going to test for that as well. Its an intermittent problem which makes testing for it that much more fun.
A couple folks mentioned a vacuum leak which in my experience has similar symptoms as well, but wouldn't that cause the car to run lean, not rich as there is unmeasured airflow entering the engine or am I wrong?