1999 Suzuki Marauder vz800 Starter issue

[mithuth]

I have a 1999 Suzuki Marauder vz800. ~11K miles. I'm having trouble with the starter. Let me describe as best I can what it's doing/not doing.

Scenerio1: Bike in neutral, Clutch pulled in, kick stand up, emergency shut off in the run position, key on.
The starter just clicks but no attempt to turn the flywheel.

Scenerio2: Bike in 1st, clutch out, kick stand up, hold the starter button, rock the bike so it moves the gears a little bit, and then pull the clutch while holding the starter button.
Vroom, it starts right up.

I've checked the starter solenoid fuse, it was good, and the contact points on the starter, solenoid, and battery all seem clean. I'm lost as to where to go from here. I'm mechanically inclined with automobiles but clueless on MCs. Can anyone point out possible fixes?