Have a golf mk3 gti and have had similar problems to what your describing and although it wouldn't actually stall when cold the revs would drop to about 450-500 rpm for a brief second causeing to battery lights to flicker on but then would just catch itself again and when warm the revs would flicker between about 850 and 1000 rpm .
All i did was to remove the air filer and hoses and expose the throttle body and removed the top and gave the inside of the throttle body a really good clean with carb cleaner and a small amount of redex straight down it with the revs at about 3000 rpm ! ( there was loads of crap in there ) and from what i have read its a common thing on the mk3's
Anyhow has stopped it almost cutting out and now the revs are much more stable with them being more or less a constant 850rpm ! the idle speed is still very very slightly erratic but its 95% better than it was ! could just be as daft as a build up of crap in the throttle body