Just a quick update.

New MAF is installed, all adjustments have been reset so that the computer can learn the new MAF. Idle is a lot smoother and the car feels more powerful. Once the computer is done adjusting I will know if this fixed the rich issues but no CEL yet so I am hopeful!

All emissions tests have finished and passed except for the purge valve, it still hasn't run. Since I didn't have an issue with this before I doubt that it will fail.

As long as the MAF proves to be the fix, Eurocharged is tuning the car next week. Yesterday they confirmed that their software is able to talk to the ECU, now they are going to talk to the tuner and come up with a tune. Should smooth out the idle even more and give it more power