I wouldn't count on the TDI being available at launch. Traditionally Jetta variants (including Variants, ha,ha, and TDIs) are introduced a year or two down the road. Diesels will probably have less delay due to the success of the CR 140, but I'd guess a 6 month delay at least. And a delay with the new car's TDI may eliminate the availability problems with the Golf.
When the MK V was introduced in the US, the only cars available for the first several months were auto 2.5s that were loaded to the gills with leather, Climatronic, wood trim...there weren't even manual trans cars for 6 months.