Great Riceman, well done!!
As for the the headlight switch, my guess is to take the headlight apart. First undo the screw underneath and take the chrome ring off the headlight body. Most likely the reflector is attached to the chrome ring.
I am not familiar with Sbarazzino's, Corsaro's or Corsarino's, but my guess is the wiring on the headlight switch could be soldered. Due to vibration soldered connections can "break". Sometimes you can bearly see it. That is why automotive connectors are better.
I mean this type:
![Image](http://motomoriniclub.nl/30-292_1.jpg)
this only works when the connection is properly shruk with a professional tool:
If soldered, I would re-solder the connections. If that does not help, the headlight switch could be shot.