Rang the dealer to cancel my order for the replacement car (after VW wrongly built the original one). I'm a bit fed up, to be honest. This whole episode has completely soured me on VW. I had been thinking about whether I'd made the right decision in re-ordering for a while and finally bit the bullet.
I spoke to the used car manager, as the sales manager seems to be avoiding me, and the salesman has been busy with end-of-month handovers. He didn't seem to mind at all (probably because it doesn't affect him) and said that he couldn't see why I wouldn't get my deposit back. Time will tell on that score. He promised to phone me back later today to confirm everything. Time will tell on that score, too.
Now to decide what I want instead. I would imagine it will be German, but it won't be a VAG product.