You're just over a month into this, and it sounds like you're making very good headway. Since you're obviously committed to getting better, I suspect that after six months you'll be a helluva lot healthier. That probably will alleviate most of your problems.
One thing I've noticed with taking melatonin is that I'll still wake up in the middle of the night, but I can usually fall right back asleep. Before, I'd often spend 45 minutes trying to get back to sleep. That really sucks.
Don't know if this has come up yet, but I found that taking an interest in cooking was one of the most important steps in my getting healthier. We Americans mostly eat shit. Eating decent, home cooked food is crucial. No unhealthy chemicals. Much less cholesterol. A fraction of the sodium. Plus, it's an hour in the evening doing something productive.