Just had the driver window fixed by VW and all is well. Took one day at the dealer. I don't know what parts were used as they are mailing the paperwork to me.
This was a PITA to live with but VW did handle it well. The cheque for $700 (2 payments) took the sting out it. The Customer Care center was also good to deal with.