My dad and grandfather have both had kidney stones before, I hope I never have them. I know my dad drank something with lemon juice, and I think it helped. Also, I think asparagus can help with kidney stones as well, although I don't think my dad ever ate them when he had kidney stones.
Anyway, I feel for yah. Kidney stones are no fun. :c