try to get rid of inflammation, turmeric is good, the stuff you mentuioned is good, see if the diet isn't too acidic or causing imflammation, enough water is important, no heavy meals in the evening, not heavy on protein in the evening, ckeck the liver, maybe see an acupuncturist to see if the liver isnt blocked/empty/hot/....possible the "yang" is out of balance and is troubling the yin (sleep, rest, ...)