Followed you from my TR. All caught up... but I am not sure what to comment on; you've worked out all of your questions...
Great job on the 1/2 in NY! You should be fine with end of Aug crowds.
EMH or not EMH -- well you could have two plans for each day. You could plan on EMH and if you aren't out of the room in time go to plan B. (which would sound ridiculous to a non-planner, but

The only glitch I see with this is that you said you were making lunch ADRs. This would be where Iyou could save money. For lunch, we usually get two meals to split for the four of us. We don't want to waste time eating sit down at lunch.
Good luck with the house closing, and keep being the great advocate for your son despite the Wicked Witch of the West (Okay, West Chester County)!