The easiest on the road temp bodge on the SS switch is to open the outer sleaving on the frame downtube and use a scotch lock to connect the 2 wires that it showed on the video that you said you watched.
I hate scotch locks but in this instance they are handy and it makes it easy to return to stock.
I’ve had a good wiggle of the side stand, running in 1st and no change - running okay at the moment.
I just had a look at the air filter and it’s not dusty but it looks a bit oily - I’m usually up front so could sitting behind Smokey trucks clog it up? My filter needed changing after 6K miles , the Himmie looked brand new after 12K but we changed it anyway.