Delay when using headlight switch?

[max]

Have you considered the engine-start switch?

It disconnects the headlight when the button is pushed.
Had the same issue on the cb900 hornet, similar system and solved it by moving the start button sideways whilst pulling on it to rub the headlight contacts together and remove some oxide.

If you switch to the high beam the blue led indicates the quality of the contacts when moving the switch if it stays on solid.