might be worth checking plugs, may be hesitating a bit.
Air flow meter is a good un, I have'nt taken a golf air flow meter apart yet, but if like all the others i have seen from other cars take the gauze out as it restricts airflow.
Also check the idle speed control valve if there is one on 1.8t, these are common problems for the symptoms you describe,
Or sale it and buy an R32, any excuse!!