2-1 EMW help

Hello! I’ve posted about this transition a couple times and I’m looking for some more advice. My 16mo transitioned to 1 nap almost a month ago and I thought things were going well. He’s been waking early 530/545. DWT is 700. He’s waking early crying and is very hard to settle. I leave him til 700. We were doing 5/5 with at least 2 hour nap sometimes he would nap longer more like 2.5-2.75. I tried dialing back his wake windows, thinking he was maybe overtired but he still woke early. And his naps started getting inconsistent, yesterday waking after 1.5. Should I be increasing awake time?

Should I try going back to 2 naps for a couple days? If so do I cap naps then? Any advice/recommendations would be greatly appreciated!!