Problem solved! Seems it was an operator error!
If you flash the headlights you then need to push forward twice to re-engage main beam functionality.
Thanks for the other information though, much appreciated!

Omne trium perfectum