I'm happy for you that you're seeing improvement during the day, progress is good!

Melatonin is helpful for me, I've used it for years (before the head wonk). I've had the best results with a time-release formula. Not all the brands are the same, some I've tried didn't help me at all. It isn't very expensive, you might want to try a few other brands. I also started taking an herbal sleep formula, it seemed to help a little with the staying asleep part.

Recently my neurologist (not your run of the mill ordinary type) had me try taking a low dose of natural progesterone. I've had a noticeable difference with the waking up during the night problem, I'm sleeping more deeply.

This is just meant as some more information, everyone is different and the same things don't work for everyone.