I wouldn't be too hard on yourself about that -- just remember that alot of the cofee beans are imported and they're sprayed with pesticides, who knows what kinds and how much. Coffee also isn't helpful for pitta conditions, the liver doesn't like it when its under heavy load, small amounts can be helpful I guess :)
From that above list, I have used everything except lots of GCG, I couldn't afford alot it sadly, otherwise I would have! :)
I have found later that potato juice (organic potatos cooked in water 15+ mins) have an effect on the stones also.
The standard Liver-Flush flush has worked for me, my third Liver-Flush was horrid, I released over 1500+ stones and the smell was so foul, yeek -- after that my cysts went away, I never got a cyst again, and then I was doing LFs for whiteheads and general toxicity. Inbetween I released alot of black bile also which helped with my mood swings and anger. Around 6 LFs and my condition was sooo much better from when I started!