I feel bad for you Exact! My bro told me the pain he had with his. I've never been e big tea, coffee or dairy drinker. He was/is.
Have you heard of drinking lots of apple juice/cider? Granny smiths are best to eat too, as I understand it for the greater amount of malic acid they contain. It may have been mentioned already in the post. Grapefruit juice too. These two juices are part of a preparation to soften stones before doing a liver/gall bladder flush. The flush is kind of contraversial as I understand it, but I think it is proven that malic acid can and does soften stones.
I hope you pass it easily and are able to keep from forming more.