No headlights

On the way out for a little bimble I joined the M25, and noticed it was a touch darker then I remembered. So I pulled over, to realise that I had no headlights, not one gone but both, and the parking light too.
So, what to do?
On the side of the M25 I start pulling the bike apart, first checking the fuses, which are all fine. Tried whacking the front of the bike, but this does nothing, so panels off time. After a little fiddling I get the lights back, but the not the parking light, odd. So after a quick chat with the Motorway Patrol man, I put the bike back together and get going again, and pull off at the next junction. As I was heading down this dark road the light flicker off a few more times, so I bail for home, hoping not to end up anywhere to dark.
On the journey home the bike stalls and will only start with the lights off, rather odd.

So in all I suspect iffy connection block on the right hand side again, with the bad light I couldn't get a good look, but I have put the panels back on with only 2 bolts now for quick removal.

But I think I will be adding in a additional bit of wiring over the weekend, though I'm worried now that the loom could be rotted I might have circuit leak to.