I'd wait and get the MK7. Its the normal mantra that you never buy the first production model year, but you can refine that to almost "Never buy a new model in the first half year" By then, die maturation and process kinks have been worked out.
Normally, here, our new models have gone through 3 build lots (Roughly 1.5 years before production start up) ranging in almost 1000 cars. Each that has been rigorously tested in every scenario known to man. Also, our cars are taken on trips in normal driving occasions (Camo'd of course) up to 150-200K before production even begins. That waay, we have a clear indication of warranty issues before the car is even out.
You cant stop the inevitable, however, just buy the car. The warranty will manage the rest.