So I checked the kickstand switch. It moves freely, it is not loose and plunger seems free of rust or dirt.
How do I tell if this is what's cutting it off while riding? Start bike up in first with clutch in and move kickstand down a bit and see if it cuts off? I'm assuming that maybe springs get weak and allow kickstand to come down when I hit a bump thereby making bike cut off and on? Is that what happens or is there more to it on this one aspect?