Sorry about the NWs, they really do go through phases and the day routine affects night sleep so much more than we'd wish, so hand on in there
I think that first nap really is UT, because although it's a short nap he can do his full A time and have a good 2nd nap, so I'd suggest extending the first A by 15 mins and see how things go.
His last A could also be too much, considering that he's only had a CN, so you could try an cut that a bit and see how things go.
HTH