I would wait as well, My reason is I went from an ASTRA SRi 150BHP (new shape) to a ford Fiesta 1.6 120BHP (new shape)petrol and whilst the car has every gadget known to small cars it was not the ASTRA (IMO a car with plenty of power and good looks). Despite only being 7 months old I've gone for what I really wanted back in 2006 and got the golf.