Finally got round to doing the twin headlight mod using the write up on here, it looks a lot better now its not a cyclops (even if one is blue and one is yellow) . Not anticipating any MOT problems but I've put a fuse in so that I can disconnect for a re-test if needs be.
Also, having experimented with the BT21s down at 32/36 psi for a few weeks, iv gone back up to 36/40. Feels immediately better, it's like a different bike!
New mirrors for the next job, I'm sick of looking at my elbows. Also need chain and sprockets soon but trying to put that off for another few months...