Right now you seem to be doing a 12 hour day, which is fine. If his normal WU time is between 7 & 7.30, then you have an EW issue on going. Are you comfortable with a 6 am start? Is it not possible to resettle him? IMO, you would still need 2 naps at the moment. A 1 nap routine is only sustainable with the nap happening closer to 12.30 or getting done later - 2/2.30. If you are getting a 1.5 hour nap with 4 hours A, that's fine. Don't reduce A at all. DD went through a phase where she woke crying from every single sleep - it's just their weird thing. So if your am nap is 1.5 hours, you would need to keep the pm nap but you could just APOP a quick 30 CN in a sling maybe??
These were the stages of our 2-1
1) At 4 hours A at 7 months, we moved to 1 long nap of 1.5-2 hours + 30 minute CN with BT 1.5 hours later --- this is to make sure no OT happens, which leads to NWs and EWs
2) When the nap ended 2ish or later, we did one nap day with EBT between 5.30 & 6. This ultimately caused issues as she was doing 14 hour nights and it didn't last long, so we got EWs.
2) I decided to stick to a fixed BT of 7 pm. As A time kept increasing, we moved to 1 long nap + a 10 minute CN and then straight on to BT routine
3) We dropped CN altogether and stuck to one nap as our A moved to 5.30
So I would say that you still have a long ways to go but hold on to 2 naps as long as possible as this is really a tricky one. Pushing too much, too fast can cause a lot of problems