chanca piedra is 'good' but maybe not good enough, or rather let's say it needs to be put in context.
cp aka phylanthus amarus is from the ayurvedic herb repository, so please look more into your ayurvedic type and eat appropriately.
imo many bile issues are downstream of hypothyroidism (and solidity is also a function of body temperature, bile will coalesce fast into stone when cooled). So please keep your body temp at 37 if it is low. You might have to spend many hours digging into this if you have a low body temp.
a single dose of Epsom Salt was standard curezone advice for stuck stones, it is probably good advice still. just the epsom, no oil.
all body stones imo are also downstream of dehydration. make sure you are intaking plenty of fluids. if not water, then soup, vegeteble/fruit juices. I think people get too hung up on drinking the perfect things where in reality it's just more important to drink almost anything.
magnesium glycinate is a very good overall mag supplement. it does not irritate the gut like Epsom Salt and is better absorbed imo and through a lot of anecdotal reports. This alone might turn the tides for you.
coffee enemas are probably the second best thing to do instead of the liver flushes. many people mix and match the two and find one works better than the other.
back to ayurveda, if you find you constitution is pitta then you can get a lot of mileage from bitter foods and herbs.
as telman said, small intestine problems and gallbladder problems go hand in hand. i hope you have looked into eliminating gluten.
another avenue to go down is a low lectin diet, see dadamo.com or pick your favorite lectin guru.