Your daily plans look great! I think it's good that you're flexible though and you're okay with things not going exactly as planned. With that said, I would recommend getting to the parks at rope drop every day you can. Obviously if you're at EMH until 2am the night before that's not going to happen

but on the other days if you can make it, do it. When I was there in February it was President's Week and one of the most crowded times of year. Making rope drop really made our days great. We were able to get our "must-dos" done before the parks got crowded and we hardly spent any time on line throughout the whole trip! We waited 40 min for Soarin' once and 30 min for Test Track once. Every other wait was less than 20 min and it made the trip so enjoyable. Of course, this is easier said than done and my mom and I are both morning people so it wasn't really a problem for us. I just wanted to put that out there because you haven't been to WDW in so long, there must be sooo many things you want to see and do!
Have you checked out easywdw.com? The site is amazing

and full of really great info.
I also really like your calendar. What a great idea. Maybe I'll make one for my BF to count down our last 15 days. (Who am I kidding? It would really be for me!

)