You are right in all of it. I can add only that:

take a glass of water before getting to bed
stop eating sweets. reduce sugar and unhealthy fat
running increase positive mod as well obviously many other healthy props
doctors are saying that after sleeping more than 6-7hours you are getting into a deeper sleep and because of that it is much harder to wake up.
during a day take a small nap if you need it but not longer than 30min.
stop smoking, reduce alcohol drinking
drink red bull with vodka. Just kidding!Don't drink any energy drinks as well try to reduce coffee intake. Since your body will get use it and it will become just an unhealthy habit.