That's great that you were able to figure out what was going on with the EWs! I have a few questions for you... how old is your LO? How did you get him to take that longer afternoon nap - did he do it on his own or do you extend naps? When you say he is going through until 6:30/7, you mean in the morning (as opposed to his bedtime)? What is his bedtime now?
We still get the EW around 5am, but since we've been putting her to bed earlier, sometimes she will go back to sleep till 6am. But our naps are still a mess! If I could get her to sleep more than an hour at a time, I know she would do soooo much better at night.