ZXR250 headlight issue

So after solving the starting problems (needed new battery), I've been absolutely LOVING riding the ZXR; and the only thing that's gone wrong so far are those dumb newbie mistakes that I've been making

However, last night pulling into a Shell, and tonight whilst slowing to pull up to a friend's house, the headlights decided to switch themselves off. At the Shell, after a minute or so, the lights came back on by themselves and the headlights were fine all the way back home. Tonight, I just pulled in and hit the kill-switch and just let it go. When it was time to leave, the headlights again worked fine all the way back home.

Any thoughts? I've looked at the wiring and everything seems to be fine; no frayed or damaged wiring, the control box on the left grip works properly (passing, high, low, both indicators); I've checked the fuses and they're also okay.

Cheers
-CT

peel back the rubber boot over lights and check three pin connector is plugged in correctly/clean both sides or the other connections back at the triple tree pop open spray give em aburl....maybe help

when my car did that it was in the switch.....could be fouled connection in the switch block but be careful pulling it to bits there's things that go sprawwwwwng!!!!! in there ie indicator cntre