From what you have shared, Lolo, I love you too much, to let you procrastinate on seeking help immediately.
If you're in a situation where you withhold drinking enough, because you have to go right away, especially as uncomfortable a feeling as it already is--you've waited too long.
The longer you stay in this stiuation, the more tax it is to your kidneys, your liver and your entire metabolic system.
When your defect gets corrected, it won't take long before you'll be able to reconfigure your system by a balanced diet, drinking enough fluids throughout the day, and especially after a bowel-movement.
Although I can only share what works for my metabolism, I think it's safe to say that you can prevent further stone formation of any kind, by gradually beginning to replace fluid loss within a few minutes after a bowel-movement, and eliminating at the early stages of needing to go.
With me, it gives me more breathing room in my diaphram, and is the time I can lower my carbon-dioxide through better breathing.