3 to 2 nap transition & EMW

My 24 week old (5.5 month) is sleep trained. He has been on the following schedule: 2.25/2.5/2.75/2.75.

His naps were capped at 1.5, 1, and 30 mins. if he gets more than 3 hours of daytime sleep, he has EMW. He has been sleeping good on this schedule.

However, it's been getting hard to fit the entire day in without a late bedtime. Bedtime is getting pushed to 750-8 pm. I also had to start waking him up at 630 am so that our bedtime is not later than 8 pm..

So we tried to do 2 naps: 2.5/3/3, with naps at 3h. First night last night and he had MOTN wakes - 330-430 with crying on and off. He did eventually settle on his own and slept.

Did I transition too fast and should I go back to 3 naps? Is he overtired?