I feel your pain, man. I made a post on here about my miserable experience with kidney stones last year.
There is no way to dissolve stones once they have already formed. The only way to make passing them easier is to get the sonic wave bath at a hospital. They sit you in a tub and vibrate the crap out of you with sound waves that are tuned to a frequency that shatters the stones into smaller bits. Even then, they'll still cut the crap out of you on the way out.
The advice my doctor gave me to prevent further stones was this:
-Drink the recommended amount of water per day for your body size. For me that's about 6 - 8 glasses. (I'm 240 lbs).
-Reduce salt intake to an absolute minimum possible.
-Take a complete vitamin supplement pill each day to make sure that you don't have any vitamin deficiencies.
-Increase insoluble fiber (wheat bran) intake. (I eat All bran cereal for breakfast every day...sometimes I mix it in with other cereal to make it more enjoyable).
-Drink carbonated beverages. (dehydrating)
-Drink Alcohol (dehydrating)
-Consume anything with caffeine in it. (because it dehydrates you and strips your body of vitamins)
-Add salt to your food.
-Eat excessive amounts of protein. (Uric Acid stones often come from eating too much protein and not enough fiber)
-Drink excessive amounts of fluids. Your kidneys are fragile right now. Over drinking can damage them.
The above list of suggestions are harsh...but they come from a doctor's perspective. Obviously, I still drink alcohol...but I'm not drinking as much as I was before. I'm trying to eliminate carbonated and caffeinated beverages from my diet, but I still have one now and then. I've also reduced my salt intake considerably, but I still put salt on my french fries. Start with things you know you won't miss as badly, and then go from there.