Bet part of the problem is city chemically treated water.
Actually, live in the country on well water. Originally worried that mineral deposits in water could have contributed to the kidney stones. Switched to spring water. I was adding lemon and sea salt to water to add in electrolytes naturally. Since I have gone back to a more reasonable water intake there have been no more stones and few UTIs. It’s been 6 years since I found the urologist with common sense. I am back to drinking the well water from the faucet. Still supplement electrolytes/minerals due to another medical issue. And instead of only water I drink some type of tea daily. I am not diabetic but crave water. Tea satisfies more than water.