Just one thought, with the hard wired headlamp mod, does the lamp switch off when you hit the starter? On the later bikes the headlamp goes out when the starter,operates
The earlier switch is a straight swap . I changed mine as I dont like the lights on before the engine is started. Been like that for 8 years and its never even been mentio ed at mot time.
But you have the front parking/city light, I never have and thats what they dont like, a switch operating the back light only until the headlight was selected. So thats why I have covered and glued the switch as its all about that in their eyes.