As for your problems - have you tried using an OBD scanner which has the ability to monitor the various sensor readings in real time or does yours just read and clear the fault codes? One as simple as the scangauge unit will provide you will MAF, MAP, temps, TPS, etc to be able to see if any of the readings is way off. Rather than shotgunning it that's where I'd look.

As an aside, apparently the MAF for the CDI which is part #6110940048 (MSRP $100) is supposed to work fine in our cars too. It is just the insert and you have to install it into the casing and for that you need a torx driver, IIRC.

__________________
Marty D.

2013 C300 4Matic
1984 BMW 733i
2013 Lincoln MKz