I'll check kickstand since I plan to remove that kill switch anyway.
Don't think twice about addressing the side stand switch right away. It will fail you. My 2014 CGT (3,000 miles) died suddenly in traffic this past weekend. Luckily I had enough mo to coast onto a side street. Bike wouldn't start nor could I hear the fuel pump after turning the key. Took the cover off the battery compartment, found the side stand switch connector, disconnected it. Bike fired up and hasn't acted up since. Thanks to this forum, I had already disconnected the same on my 2016 Desert Storm as a precaution but I forgot to do so on the CGT.
Check the battery connector as well. My 2016 Desert Storm had issues with that at around 1000 miles. Bike sputtered, lost power, and I pulled over, bike still idling. Drove back home slowly with no issues. Read this forum, checked my battery wiring and found the negative wire connector just barely hanging on due to binding stress/vibration. Repaired the connector and rerouted the wire.