I think the new plans sound great. And it looks like you'll be saving money without the DP. I know the totals were about the same, but your OOP cost included tips, so there's a good saving right there.
On the EMHs.... I've never done them, but I am considering it for this trip. I've been thinking that since Disney has stopped running the monorail on EMH evenings, that must mean that the crowds are too low to make it worth the cost. To me, that says EMHs might be a good idea, but what do I know? I REALLY want to do eve. EMHs at AK at least once though so I can see it at night. It's the only park I have never seen all lit up.
I think you've got a good plan going! You should feel good about it and stop worrying. And since all of your ADRs are at resorts, you are free to change your park days as needed without having to shift everything around. Worst case scenario.... you get there and see the EMHs days are too crowded, you can just switch to plan B and keep on going!