I have exactly the same engine and exactly the same fault codes and exactly the same running problems!
I clear the codes wi vag-com, run it, nothing shows up. I did the timing as per haynes basic settings and cleaned the throttle body, but you have to do a TB realignment with vag-com to reset the TPS. (throttle position sensor) - its easy but needs the kit obviously.
The clicking is the TPS trying to find idle position. I sprayed mine wi wd40 after removing and super-cleaning the tb. The cutting out stopped. I did the TB alignment and it stopped hunting and starts easier, quite good when warm.
Now im left wi stuttering power when warmed up and it needs a bit of throttle to catch when cold but after a few blips its ok and pulls like a train when cold and steady. Its really bloody quick when its below 50o oil temp on the MFA.
I think the hall sender in the dizzy is on its way out, so might take a dizzy from a scrappies, passat are common and good for ady parts, scrappies hear "gti" and go "ahem! Expensive!" - on the other hand - "passat? Whassat?" much cheapness.