FCP Euro is definitely a great site to order from with their lifetime replacement. INA is a quality replacement just one suggestion though since you got the lock carrier off why not do the water pump too. If it was me I would go for this kit

VW Timing Belt Kit - Continental KIT-06A109119CKT1

VW Timing Belt Kit - Continental KIT-06A109119CKT1

www.fcpeuro.com

Otherwise, you nailed it on a good kit. I also get timing belt kits from BlauParts

 

Seems that Blauparts is out of about everything.....

 

I've put in 3 or 4 of the FCP non-hydraulic kits in over the years and they seem to me at least to be high quality, reliable parts.

The instructions for the tensioner are kind of fun since they are in 'euro-picture language' but it's pretty easy to understand how they go in.

 

As bostonmacosx suggested, I would definitely replace the water pump when replacing the TB.

 

VW used the spring tensioners on the Golf engines for years. Our 2005 2.0 has one.

 

DIY: Install Updated Mechanical Timing Belt Tensioner

Intro VAG released an updated MECHANICAL timing belt tensioner made by Litens for the 1.8T engine several years ago to replace the ubiquitous, but problematic hydraulic tensioner setup. It uses a coiled spring inside an eccentric-mounted pulley to apply pressure to the belt. It is very similar...

www.vwvortex.com

 

Yes, it's the same engine, just some different mounts and hoses due to the transverse Jetta engine.