I had my re-inspection yesterday and...passed!
But not without having to argue with the numb skulls.
I was able to stay with the bike for the re-assessment, so was talking the guy through what I was doing to demonstrate the kickstand switch was working. I said "Ok, so the stand is down, the bike is in neutral, it will start" and he replied with a "No, it shouldn't". After a brief argument, I quoted the ADRs and got a "hmm, I guess the rules are different for these bikes". WTF
I'll be writing in a letter of complaint. Why are these blokes inspecting bikes if they don't know the first thing about them...
Thanks to those who offered to lend mirrors etc. I ended up borrowing a pair of mirrors and indicators from Wells, who it turns out lives just up the road from me. Every cloud has a silver lining - we're going to tee up some rides.