I would just ground the solenoid. That lets you use the starter anytime. There's obviously some risk of using the starter motor with the bike in gear when you don't want it to move... but in my opinion that's a stupidity issue, not a motorcycle issue. It's pretty nice to be able to start the engine after stalling in gear, it can be a bugger to get the gears to change with it stopped and you can't use the kickstarter in gear without putting the bike on its centrestand.