The doctor was able to do the shorter procedure via cystoscope. So we get to go home today without surgery. Margot is currently doing fine, sleeping off the effects of the anesthesia and pain meds.
We won't know for anywhere from six weeks to six months whether the problem was corrected, but the doctor is hopeful.
Thanks for all the well-wishes everyone, it means a lot!