Noticed the GTI is now listed on Drive The Deal with a £1600 discount, including the £500 dealer contribution.
Unfortunately work commitments mean I'm not going to be able to get to my dealer for three weeks, but I'm fairly confident I'm going with 3 door, Tornado Red/black roof, City Braking pack, climate control, adjustable passenger seat, and probably the Beats audio system. So much for keeping it simple!