Anyway, it went to VW 3 times, waited with them a whole weekend for WV technical, yadda yadda yadda, had to hire a rental car etc, extremely peed off about the whole thing, and was loosing hope, when I bought a copy of everyday mechanics magazine from borders in town.
It didn't have the answer, but it did have an engine diagnostic doctor section in it. I contacted him (Simon) and we talked over the symtoms. and we were hard placed to figure it out. I told him of the intermittent fault code (MAP sensor) so he suggested that I could replace that with another 2nd hand one, to isolate it. It didn't work. However he then suggested I do the following to the letter:
Remove all air filtery crap.
Remove throttle body
Clean all the crape off the back of the throttle body plate
Replace the throttle body gasket.
clean as much of the inlet manifold as I can reach without dismantling it.
replace all air boxy stuff.
fire up vag com, with the engine turned off, go to engine > then channel 60, then [switch the basic settings]. The throttle body winds itself open, then closed fully the cracks open a bit and resets itself up.
Warm up engine on idle until golden brown and fluffy.
After which it drives totally different, no more choking, no more revs droping and lack of torque at idle. It tries to overrun now (which it was supposed to)
Not seem that pesky light since and have done over 500 miles so far (finger crossed) I'm pretty happy to say its it fixed. If it happens again I will find this post and let you know.
Stupid engine management, thinks its knows best... Whose the engineer now eh? Self adapting idle program my arse. I was just about to adapt it with a 20lb hammer!!