blessed2bamama, I've never had kidney stones, so I'm not the voice of experience, but this is what I would personally try if I were in your shoes.
Stone Dissolve TeaThe Stone Dissolve Tea is supposed to work within three days. If it were me, and I could afford to, I'd pay for quick shipping, try the Stone Dissolve program, and decide if I wanted to go the surgery route after I'd already ruled out that option.
I've used other products of Dr. Foster's before, and while I think she's a little weird, I overlook that because her products have worked very well for us.
Agrimony is supposed to help relieve the pain of stones, as well as possibly help them to pass, but it can be a difficult herb to find.
As far as what you can do for in the future, Dr. Foster offers an entire program for kidney cleansing, and I'm sure that there are many others out there, as well.
Hope you find something that works for you!