OK, quick update - I took it back to the Jag dealer in Leeds who didn't have a clue, and have booked me into the Stockport Audi dealer for them to sort it - fortunately under warranty.
Hopefully they'll install facelift light clusters. Well, I can dream, can't I?
I'll post back when I find out what the problem is.