i had the same kind of problem on my rs mate.

i tryed everything! literally, i solved the problem by changing the coil (which i dont think needed to be done) ht leads and plugs thats solved the problem.
i think it would be the ht leads though. im pretty sure it wouldnt be the MAF because i was thinking the exact same as you.
if i was you get a set of leads and try them!!!
let me know how it goes
Charles