We’re headed down the 19th through the 25th! I’m so excited! I think your plan sounds good.
I wouldn’t drop any headliner fastpasses, but I would keep looking to see what you can find. You never know. Also keep in mind the day of fastpass drops that Disney does.
I was also pleased that even though the CL went up some of the days of our trip, our wait times didn’t increase too badly. I would just be ready to sit and rest in the park when it’s needed. I’ve tried to include some in park breaks (I am also a type A planner and can over plan so much that I don’t stop and see what’s happening around me). Just having a little bit of free time I think will be a little liberating. Even if you don’t get to do EVERY ride, having everyone be happy is the key - and that includes letting people rest.
Random anecdote: I took a 3 week europe trip with school after I graduated from high school. We saw a TON of things. Most of them I don’t remember. One of the things I remember the most was one day in Venice I wasn’t feeling very well, so me and a couple of friends sat on the grand canal and watched the other tourists and performances of gondoliers for a few hours. I look at plenty of pictures of that trip with fond feelings, but I REMEMBER sitting there and watching those boats for hours. I’m sure I missed some beautiful sights that day, but I also have some wonderful memories that I would never give back.
This is coming from a type A planner. Thank you for prompting me to remember that so I can apply it to my own trip!