Hi hun, last time you posted I think you were trying for a short CN in the morning, followed by a longer afternoon nap. From what you've posted above am I right in seeing that you're going for a longer morning nap now and a shorter CN in the afternoon?
If that is the case, you will really need to push that morning nap out later to reduce the EWs. An early morning nap is ok at this age if it is short as you want him to be UT going down for it so he's not too grumpy on WU. You also want to limit the CN first to one sleep cycle - so 45 mins. If he's gone through the 45 mins to an hour, he would probably be grumpy on WU as he was tired enough to take a full nap and woke mid-cycle if that makes sense.
It sounds like he is now quite OT, but the way of this is (although counter-intuitive) to push that nap out later. If he takes a CN in the afternoon great, if not, go for EBT. What do you think?