Similarly; wife wasn't happy about the kickstand angle (too much lean) and it seemed loose when riding; I put an oillite bushing in the swivel and added a touch of hard weld to the top of the locating tab; now it works like it's on a BMW

 

Only time I have encountered this issue is when riding 2 up and did not adjust the shocks accordingly, when I hit the lane divider bumps it would throw the spring. Basically I was overloaded and did not compensate.