Yeah, I think that's your early warning sign that you need to tweak - cap that PM nap a little earlier. Only tweak gently though, the UT is only just peeping through so 5-10min extra A time should do it. I'd cap at 45min and see if that helps - sit with it a few days and if he's still EWing, cut it to 30min.