Do yourself a favour.As you are going to have the tank up etc service some of the electrics.
Buy a can of Switch cleaner(Maplins or Servisol from Maplins) and get a can of ACF50.ACF50 is,"Ronseal++" as it does more than it says on the tin and goes a long way if correctly applied.
http://www.acf-50.co.uk/motorcycle.htm
Buy from local motorcycle shop or usually cheaper on-line,
http://www.ebay.co.uk/itm/ACF-50-Mot...IAAOSwdjNZCEQT
Then pull apart any electrical connectors your work is allowing you access to checking for corrosion and remove with tiny screwdriver wrapped with a bit of 500 grit paper is required.(Especially the large one near the head-stock) and spray with Switch cleaner,let evaporate and then sparingly spray ACF50 into male and female sides of the connectors and also where the wires go INTO the connectors.
This will ensure you have very few electrical breakdowns at these points.When you have time remove rear fairing and do one of the most important ones like this e.g the Regulator/Rectifier connector and clean any debris from the heat sink fins.This large connector is one of the most frequently overlooked causes of R/R failures due to lack of electrical maintenance.
Since doing electrical servicing on motorcycles like this I've not had a major electrical fault in over 13 years.