The contract doesn't come into effect until they deliver the car to you, so it should be possible to rip up the old one and recreate.... contractually.
Of course they might be buttholes about it, but insist that after all of the delays its the least they could do!