There has been another slight wiring change to the dash. Due the way the Hibeam flasher circuit was connected, it appears that there would be a permanent 12V at the switch. The same switch that is mounted on the steering wheel and exposed to all the elements. The switch is IP67 sealed and I have attempted to seal the connections at the back of it but I don't want to risk flashing the battery life away when left parked up.
So, the 12V feed for the hibeam now comes from the second gang of the Ignition toggle switch. This makes it much more protected and the feed will only be live when the ignition switch is on (and even if the keyswitch is not in)
Remember, my keyswitch is effectively a battery isolator and the toggle switch is the ignition switch.