Hi there!
He's still so little, at this age, it's really hard to hold them to their routine if they're bound and determined to sleep. My ds was like that -- slept when he felt like it, and I just let him. One thing you could try is that when he wakes at 5:30/5:45, give him a small feeding (we bf and I'd just do one side, but I imagine you could do less oz if you're ff) and that way he'd be decently hungry when he woke later. I would just treat the EW as a NW though and not get him up as you might create a habit of waking that early (definitely NOT what you want long term...). Some babies are just particularly sleepy. While my girls were sleeping less than your little guy, my ds was sleeping something like 20 out of every 24 hours at 7 weeks and even past it. He will eventually wake up more and be able to stay awake for longer periods of time and it will sort itself out. For now, it sounds like you're doing a fabulous job reading his cues and giving him what he needs.