Yeah, this is a concern for my next car. My GTI is just over 3 years old (with a 5 year warranty) and I do fancy another Golf, but probably an R...which I know will not come in at under £40k as I specced my GTI to £35k list...without leather or PP.
As a 7.5 Golf will not be available to me until to tax changes come into effect, I think I will now wait it out for the Mk8 (or something else) unless there are MASSIVE discounts on the facelift cars!