I had my gallbladder removed about 30 years ago for many of the same symptoms you're having. It actually improved the quality of life for me greatly at the time. So if in the end you have to do the surgery, know that it's not the end of the world.
That being said, if I would have known about the Liver Flush back then, I know I would still have my gallbladder today. So I understand why you're trying to use alternative methods to clear the stones out yourself. It's a tough decision to make though. Best of luck to you. Let us know how it turns out for you.