At least you got another '8.. Looks like I'm with an A5 for a while as the A7 has had a couple of niggles with the Stop Start system which resulted in it refusing to start a couple of weeks ago. After some fiddling around with a new starter motor, they've decided that the engine is toast and are just waiting on the go-ahead from the warranty folks.
Not sure exactly what's died in the engine, but apparently it now makes a scary noise on the driver's side bank and there's bits of metal in the sump.
For those of you that are interested in such things, they reckon about 10k including labour to do the engine swap (3.0TFSI). So I decided to continue the warranty for another year