So, first of all the EW .. is anything physical causing it? Light, noise, birds, heating coming on, dirty nappy etc?
DD2 hardly ever took a catnap. I think I could count the times on one hand, so they are not really an area I am familiar with. But ... here's what I am thinking ...
1) Do the catnap and keep it short. But instead of having him wake from catnap and then go to bed an hour later, could you extend bedtime that way. If he wakes at 5 can you keep him up until maybe 645? If he is taking 30 mins to settle at 6pm then likely he is not ready for bed anyway, kwim?
2) Work on extending that pm nap ... W2S/pat shh to get him to 1.5 hours so that he has had a good restorative nap.
3) I would see how the wake up goes this morning and if he is up at the same time again then use W2S an hour earlier to try and sort that out
When Callie wakes early in the morning, I don't change the time of the first nap accordingly. That way the day stays on track and bedtime doesn't move earlier. For Callie an earlier bedtime no longer solves EW's so I try to keep bedtime the same. So if she wakes at 550am, I feed her at 7am and she naps at 10am. It doesn't cause her any difficulties, no OT nightmares .. but I don't know if the same would work for you?
x