Ok Kim, here is what I'm thinking...
I've learned over the last few weeks that once lo's are taking decent naps and are not OT, EWs are usually because that last A time before bed isn't long enough and OT causes NWs. I can't explain why Ethan woke after he went to bed because he had such long naps yesterday (more than 3hrs total), but I do think the EWs was due to a very short A time right before bed. My DS did similar things in the morning of going in and out of sleep if he woke early and I just let him be after we caught up on OT.
I think we have a good basis to work with now and we should take a look at where we can tweak. The first thing that jumps at me is total daytime sleep. I think you need to limit it to 2.5-3hrs total. Look back at last week and see how much DT sleep gave you the least amount of NWs. Use that total DT sleep as a basis then reduce it by 5-10min until you find the ideal amount to help STTN (ladies in our BC suggested this to me and it worked).
Secondly you need to figure out the best A times for your lo that gives you the best nap results. The most critical is the last A time to BT that won't get your lo OT. Again, look back over last week and see what A time to bed was ideal where you didn't get a wake up before midnight.
Your question about Ethan waking later and what to do about that 4hr A time - for us, once things were settled, DS started waking around 6:10-6:40am and this really worked for us as I have to do preschool run with DD. It did mean that bedtime was around the same time as wake up, sometimes as late as 7pm. So you need to think what is the ideal time for you and Ethan and work from there.
Lastly, if you truly want Ethan to STTN you CAN'T feed him if he wakes.
But let him try and resettle himself like you did this morning. Of course if he is screaming and crying go to him, but again don't feed him. I know it is hard, but it pays off in the end - trust me. I had to do the same with my DS once he turned 7-7.5mo as I knew he was eating 3 very good meals a day and drinking 20-23oz of FF a day. You have to break the habit of them waking and thinking they are hungry. You will see a difference in a couple of days, I promise.
HTH. Good luck and let me know how things go.