I've been in to see them and also sat and reviewed the agreement with the Finance Manager. I asked them this question about honouring the agreement if I wait to collect the car on the 1st Sept and he said thats the least they can do under the circumstances having waited 2 years !
The cash back I'm gonna get will pay for the upgrades I want to do - so I'm happy.