In researching MSK for a few years now I have found to actually 'cure' my episodes in having kidney stones!!
I drink Marshmallow Root Tea everyday (at least once or twice). I also avoid taking calcium supplements even though they say they help. When I started taking them suddenly I was back having kidney stones. I also take Vitamin C, eat Watermelon and drink lots of water and herbal tea. Above anything though, as long as I drink the Marshmallow root tea I don't get any bladder infections or kidney stones. I cannot explain it nor can I say it will work for anyone else but for me the pain and stones are gone. I also avoid added salt, red meat, ham, canned vegetables and canned soups (in other words SALT!) and chocolate (but I am weak sometimes).
Good luck and let me know how you make out after taking the above for a few months.