Yamaha 1300 Tourer - Yamaha 1300 Tourer Fansite

Hi All,
Hope someone has a suggestion before I tear into this thing.

Normal starting procedure:
Get on Bike, put up kickstand, in neutral, turn key, hit starter button.
The issue is that when I hit the starter button it will often crank once or twice, then hesitate, then start cranking again and start.
Some times it's a crank once and stop cranking so I release the starter button and try again and it will crank.
It seems to be happening more often now over the past couple of months.
Checked the battery, it's fine, 12.8v.
Could it be the start button switch or a relay in the side stand, or...... ?
Thanks ahead of time