OK, the bike has been Oryx'ed.
This is how it looked before:
And this is how it looks now:
It's also had new wheels and tyres put on in preparation for a 130 mile ride I am doing in September. I am pretty happy with it, only just got it back so have not ridden it yet, going to take it out later and try it out.
Will keep me going until the GTI arrives. Just had a call from the dealer, looking like late September/Early October delivery now - what a lot of crap!