Thanks
@T**
I took your advice and re-arranged my driver from Friday 31 to Monday 3rd, which is in the 'early' window for 90 day reporting. I should be able to do the stamp transfer followed by a TM47 report in person which will have the new passport number on. Hope this is enough for it to work next time around and avoid another 320Km round trip to my immigration office.