Gail, we pretty much have the exact same issue. Ben naps at daycare at 12:30 and with EWs it makes for a looooong morning A time, so I find a lot of the time on the weekends he almost needs 2 naps to catch up. My CM tried putting him down for a morning nap for a while, but he completely refused it as he was way to interested in the other kids and didn't want to nap unless they were napping too.
I don't have much advise, we go through periods where he will sleep until 6:30/45am and then this morning a 5:30am EW out of no where. Even at 16 months I find at home going from 5:30am to 12:30am is too hard, so this morning I put him to bed at 10am - at least at daycare he has lots of other things that distract him.
Honestly, I've just come to the point where I know that EWs are a part of our world. Ideally getting on a consistent schedule with daycare is best, but I know exactly where you are coming from that sometimes the OT is so bad from such long A times that 2 naps are needed. I just think it will work itself over time - once he can grow into such a long morning A time the OT will reduce and hopefully the EWs will disappear. He's been at daycare for almost 4 months and we still don't have it quite figured out!