Hi Luke

Did you change the fuel filter?
Was it a quality fuel filter?

It does seem like MAF to me too but it might be worth checking the fuel pressure when the problem is occurring.

I normally expect 9 -12 g/ s MAF readings at idle on my modis.
MAF problems can alot of the time be found looking at the fuel trims when the vehicle is driven on the road under load.

Check intake manifold vacuum as this is a good indication of lack of air flow, air leak, egr stuck open, blocked exhaust, timing, ect, it only takes a couple of seconds and can rule out quite alot of possibilities.

Hth
James