50/50 Push Button Start Starting..

Bike turns over 50% of the time when it's warmed up. The bike starts great when the starter engages but the problem I'm having is that the starter doesn't engage sometimes. After sitting for a while the bike will start just fine usually. Sometimes if it doesn't catch and I'll go to use the starter again and it won't turn over. I can hear a click each time I press the starter button but nothing happens.
The following happened yesterday which is my motivation for bringing it to the forum, leaving work it started up as usual but then I get on the road and came to a stop at a light. I turned down the "choke" too soon and it died at the light. I flicked into neutral and try to hit the starter button and nothing. I turned the ignition off then back on at the key and nothing. So I turned on the ignition and push started it and it started fine.
Sometimes it won’t start until I come off the center stand and then as soon as it hits the ground with a jolt it will start. What bothers me is that it isn’t consistent. What do you think the dealio is? Sometimes turning the key to off, removing the key and then turning it back on will work. Sometimes I forget it's in 1st and with the clutch in, it will start.

I was going to get some contact cleaner and spray out the ignition switch, off/on/off switch, clutch switch, neutral switch, kick stand? If the bike has five required contacts in order to engage the starter then I'm sure I'm in for some fun.

What do you think the issue is?

BTW the bike has been an awesome daily driver, I have really enjoyed riding it to work each day. Thank you for everyone's help.

 

Starter solenoid next to battery will produce loud clicking, not necessarily broken but elctrical contacts may need a good clean, I changed mine out from a doner bike but had to resort to full elec clean and overhaul to sort out for good and ended up refitting original solenoid

 

These two symptoms add up to the sidestand switch moving to the top of the list.

 

If a quick cleaning doesn't solve the issue I may just bypass it...