Help with stubborn emw

My sleep trained 7 month old continues to have stubborn early morning wakes. He has been on 2 naps since 5.5 months old - started with 3/3/3.5, and now is on 3/3.25/3.75. He takes 3 hour naps, last couple days I have capped to 2h45 mins, but it has not helped..

He used to get emw where he would cry, but resettle on his own. For the last few weeks, he is just wide awake at 540 am like clock work. I anchor the first nap to 0915-0930 depending on wake up time and usually do not get him out of the crib until desired wake up time of 630 am. But he's up like clockwork, usually rolling around and blabbing.

Do I need to add more awake time? If yes- what schedule should I try? Is there anything else I should be doing?

Thank you in advance for your advice!