Glad it is now sorted. Shame about the annual subscription if you did not need that.
£140 for the diagnostic is steep, but I assume standard price by main dealer.
The time it takes them to update the software and firmware is not insignificant, it boggles me why, but mine took an age as well.
Luckily mine was authorised used, and I made it a condition of purchase. The sales lady did try and check with the garage and the garage incorrectly told her was on the latest s/w. It was not, I was on a "current" software, probably like yours, so old, but not out of date and still in service, so they do not update those versions unless they have to, as it is such a pain.
So in my case the update was a free update, but I saw the hours they billed Audi warranty!
Note I have paid for an annual map subscription, as I quite like the live traffic. I have a HUD, and though Waze is better in town, the Audi data is fine on A-roads and I like the directions in the HUD.
You can have carplay in centre screen with a mini Waze screen to alert you for police and cameras.