Jen,
I'm having many of the same troubles you are having. I had some crazy weeks with early wake-ups. It is better now, but I am still having troubles. Here is what I am doing. I am doing a DF at 11:00 PM and then trying not to feed until around 5 or 5:30. A full belly seems to help settle him better at that early hour. After a little while of trying this, he began sleeping in longer again. Unfortunately, he is waking between 11-5 am. Typically around 3, and then 4 AM, but I can pat him back to sleep.
Maybe if you push his A time 5 min at a time, he won't get quite so OT? Have you seen the thread for moving from 3 to 4 hr in 5 min intervals? It's on the sleep board in general facts.
If he wakes at 5, I would try to resettle. I would do whatever it takes to resettle him. It is so much easier to maintain EASY if the day starts at the right time. I wouldn't worry too much about AP. Use it if it works for you- you can always break them of it later. If he doesn't resettle in whatever time is "normal" for you (for me it's about 15 min) then I would start that as the beginning of the day and I would feed him. Everything would get pushed earlier. When I posted a similar question a few weeks ago, many people told me the EW is due to being OT. I think it is pretty common when you are pushing A times.
Hang in there!!!