Good to hear you got that sorted out, it seems they knew what they were doing and being firm with them has paid off ... the exchange they are doing for you I'd say is reasonable.
As for the colour, my personal preference would be Silver (I want my next car to be Silver) as it hides dirt and light scratches really well.
The best colour for a Leon I think is Yellow ... but should anyone bump into you the garage will never match the paint 100% and you would have endless problems (I did with my Ibiza).
All the best, wait till you feel the difference with the PD130! Remember... six speed, white dials, 96kW on the boot sticker!
Aye, looking at the advert i can see the gear knob, and white dials, and the 130 sticker on the boot, and the red DI on the TDI.
Is there a noticable difference between the 110-130 then ?