Funny you write about your situation since I'm working on my ,hopefully, solution. I've tried some of the same things as you but I go back to the same routine. I've decided to get rid of all distractions in my room. No TV, no phones and even a clock. I have an echo that I can ask the time if I need it. No caffeine for now. A book to read. I'm also blocking out all natural light in my room and replacing it with a lamp the mimics sunrise and sunsets.
We'll see how it works. My plan is to get to bed by 10 and up by 6:30 or such everyday. So I will start to get ready an hour earlier. Saturday and Sundays too. I've also added a daily stroll at 7 am so I don't feel like I'm getting up early for nothing. I think that part of the fix is making sure to stick to a routine and not deviate. Since I'm bound to fall back to my old routine over time. I hope it works.
Maybe you can get some ideas from my solution.