I agree with Becky, at this age we too were on set naps. I wonder if you are getting the EW because the nap is so early. At this age R was napping closer to 11.45-12noon (with a 7am WU and 7pm BT) So maybe in the first instance, deepening on how your LO handles OT, get the nap to 11am?
What do you think?
Hena