Update - Still working on this problem.
I noticed my car doesn't stall when I unplug the MAF which I understand can mean a faulty MAF.
Bought a cheap new one from ebay and tried it today and saw weird results:
New MAF Plugged in - On idle the engine loops between almost stalling to just running regular rough idle. When I unplug the connector to the MAF it runs at just normal rough
Old MAF plugged in - Car idles virtually the same (i.e. rough) whether the connector for the MAF is plugged in or not.
Not entirely sure what this means. Am going to try driving tomorrow with the new MAF plugged in to see if it calibrates after a while and improves the problem.
*Anyone here know what a healthy GTI does when the MAF connector is unplugged? Does the car stall?*Car is going in at the end of the week for Cam follower change and DSG service, so will see if these do anything. Might see if I can get a new Divertor Valve before weekend and fit it over the bank holiday. Also may pick up some carb cleaner and look for some vacuum leaks tomorrow.