I'm certainly no expert, but I can definitely sympathize.. we're going through short naps and EW's over here too
It sounds to me like your lo might need to catch up on sleep if he's waking so early from naps.
And I have nothing to go on but personal experience here, but MAYBE he needs less A time in the AM because his sleep is so broken... if he's waking at 5-something and then back down until 7-something. My thought would be that he's not as well-rested as a lo might be waking up from a whole night's worth of sleep? I know that my ds is definitely ready for a nap sooner if he's had an EW and gone back down for a bit (although he goes back down for half hour at best) than if he's STTN.
Although, you have to be so careful here because you don't want that nap to become an extention of his night sleep.
Maybe if you post your new EASY, we can see how much total sleep he's getting. Has he always needed more or less than average amounts of sleep?
I know how frustrating it can be. I can't count how many times I've thought about cc or cio, but it's just not fair to our lo's and it's super confusing to them. This may be part of the problem as well?
I know it's easy for me to say. But, trust me, I'm struggling with a lot of the same things (read my MANY posts!). In the past, it has been helpful (and less frustrating) to pick a PLAN, post it (for feedback) and go with it CONSISTENTLY for at least a week. And then tweak what's not working...
?