I've been taking Magnesium Citrate and Magnesium Malate for about two weeks. I was thinking that may be why I'm feeling better.
Should I be taking any Calcium?
I recommend staying off of calcium for the moment. One reason is that your symptoms are still consistent with hypercalcemia, which again can be intermittent from high phosphorus in your diet. Second reason is that the magnesium acts as a calcium channel blocker, which will improve circulation as well helping with the healing process. And you are still going to be getting some calcium from your diet and the herbs.
I've already got some Nettle Leaf and Schisandra Berry. I haven't got around to taking it yet.