I tend not to ponder symptems too much but focus on helping the body to do what it knows how to do, best; and that is heal. I think you are a candidate for a good old fashioned liverflush and colon cleanse(including colonics). Whatever the root cause of your problems, this will go a long way in fixing it/them.

Water won't remove the stones. You need back pressure, dilation of the bilary ducts, and a signal to release bile for this.

Remember, a congested liver is a prime target area for parasites and candida. Think of a stagnant pond in nature vs, a continually flowing stream. Which one is fresh and clear?

Time to cleanse.

Read Hulda's cleanse and also Andreas Moritz 's cleans(which is like Hulda's with a few more, easy to do features).