Not sure if you fixed this yet but mine did exactly this too, really rough idle but it would also nearly cut out at the traffic lights.
I think you may be right about MAF, I cleaned my MAF and it hasn't done it since, idles perfectly, it also doesn't pop anymore when changing down kind of miss that a bit, guess it was just running rich.
|