I am taking basically what your taking as far as the basics. The other things I have added overtime is Livercare and milk thistle. Sometimes the Livercare will stimulate my liver and it will release stones on all it's own. A must with for anyone with AF is Glutathione and NAC at the same time as C. This helps the liver detox as well.
Another thing that will eat your energy up is high histamines and inflammation. Although some folks are low in histamines. I take Cod Liver Oil, Boswellia and Mangosteen. Find a natural anti inflammatory there a lot out there.
The latest thing I found that was very hard for me is adapting to a paleo diet. When I cut out everything except meat and veggies and some fruits my sleep improves greatly as I recover from my crash. That also means no condiments, sauces, fermented food or anything thing else. Just basice meat, veggies and fruit. I tried this for two weeks and it was awesome. I am going back on it in two weeks and do it for about 6 weeks.