Electrical Switch under the clutch lever - Problem!!

[Orfeas]

Hi all. It's been a long time since my last post in here due to my heavy work load which wouldn't allow me to spend much time on the board.

I've come back with a problem that needs a solution and of course.... your help :P

A week ago i noticed that the bike wouldn't start if i had a gear in although the clutch was pulled (of course the sidestand was up). Then i realized that the brake light didn't work when i pressed the brake lever as well. In both cases it did work 1 out of let's say 20 times.

So i saw that there are two little switches beneath each lever (the ones responsible for the clicky sound each time we pull one of the levers). I checked the wiring, it seems ok, i even sprayed some electrical contact cleaner, but the problem still there. 2 days ago my bike wouldn't even start. So i powered her off from a car battery and went to buy a brand new battery.

I swapped the battery but still the problems with the switch were there. (100 wasted euros for the battery huh?). Last night i started jiggling with the wiring of the switches and like magic both of my switches started working for a while and then boom, still the same....


Any suggestions????? Does anyone know if i should buy new switches and replace the old ones? And if yes, would that require to screw with the whole wiring system or i could just cut the wires from the old ones and stick them to the new switches? Because if the switches come along with the wiring as well, then i 'm in big trouble and i'll probably have to cut many wire straps and do some heavy unscrewing under my headlight....