Hello, I'm bumping this post for you, I'm not sure how much help I can be
What does jump out at me from your post is that, imo, bedtime is a little too late. I'd say in bed for no later than 7pm, he's getting overtired because of this, I think (the early wake ups could be because he's going to bed too late - overtiredness can cause this, you'll often find, early to bed means getting up later).
It may be that he's on his way to transferring to one nap, and you need to cut down on the second nap, in order that the nightime sleep is preserved. I'll look up some links for you