Just want to let you know this was eventually resolved with the help of the dealer principal. They finally agreed to do it for free on the day or handover.