I have exactly the same symptoms, 04 Jetta wagon. Smoke on cold start, stumbly idle for a few seconds. I also changed my cam (unrelated and was bad), new clutch, went to the dealer for glow plug flash and new plugs. I haven't yet tried messing with the glow plug harness, I'll have to look up...