Hello! Long-time lurker, first time poster but I hope I can help others on here in the weeks to come as I grow more confident

.
Anyway, trying to resolve LO's combination of NW and EW problems. We've fairly recently switched to a 4-hr EASY which has helped the NWs a little bit but still not 100%. Here's our average day:
E - 6am
A - 6:20am
S - 8am
E - 10am
A - 10:20am
S - 12pm
E - 2pm
A - 2:20pm
S - 4pm (CN)
E - 4:30/4:45pm
A - 4:50/5pm
E - 5:45/6pm
bath, massage, and bed around 6:15/6:30pm
Night-feed happens at around 2-3am. We cluster feed in the evenings because a DF was causing worse NWs and neither one of us liked it.
Anyway, I'd LIKE the wake-up to be around 7 so we can do a 7-7 day, but lately he's been doing 6am and today it was 5:30! We're also having NWs which can vary to once an hour to only a couple a night. Even the days he naps really well he still NWs.
Sometimes A time is a little shorter at 1h45 if he's getting really grumbly, but I then try and tweak the rest of the day so it still all evens out.
Just also to say we used to do a 7pm bedtime but he was having massive OT issues so I moved it up to temporarily catch up on sleep. I've tried moving it back to 7 but he still wakes up at 6am and causes worse NWs - maybe fix the NW first then tackle EW?
I can deal with the EW if we can get the NWs sorted. I just can't see what's wrong!