Sorry to hear how distressing your problems are. Here is some info from Hvergerti and youīll probably find more in his forum....
1) Nettle leaf helps to dissolve kidney stones and strengthen the tissues within the kidneys. Also contains anti-inflammatory sterols and builds up the adrenal glands to further reduce inflammation. It is safe for long term use and tastes great.
2) He spoke of licorice also being very good for AF issues.
Also look into Traditional Chinese Medicine (TCM) which may be helpful in reducing the "heat" issue.