Thanks! That set looks like a good shout. In the end, I went to Halfords but couldn't find any reasonably-priced sets with the items I needed so winged it with my existing socket set. Cue a frantic last-minute flurry when I realised there was nothing suitable for the head bolt!
Pegged it up the road to the local tools shop (On bike as A8 somewhat undrivable
) and sorted, T55 bit purchased for about a third of the price at Hellfrauds.
It's now in and working, as soon as I find the PC cable for my camera I'll post a picture. I love it!
PS. Thanks to whoever answered the 'phone at A8 parts when I was failing to find the second airbag bolt in the steering wheel- It turned out, somewhat bizarrely, to be a 4mm allen bolt rather than the Torx 30 on the other side! Odd.