One small suggestion I have is magnesium orotate. I'm dealing with leaky gut from candida overgrowth from mercury poisoning...and I know my issues include various deficiencies including magnesium.
Dr. Nieper's orotates are amazing. For you, I would first try magnesium. See how you feel - if it calms you enough (it will definitely help). Then I'd consider zinc and maybe even lithium orotate.
Read about orotates and you'll see how good these mineral transporters are.
-Elizabeth.