I know you posted this a week ago, and I think your new plan is great and don't mean to disrupt anything. But I wanted to point out that you may be deceived by a quirk of the FP+ system that confused me when I was planning our trip. If you already have FPs for a ride, say BTMRR, then the FP system will show that there are no more FPs available for BTMRR that day, unless you go to your existing BTMRR FP and click the option to Modify that FP. If you're just looking at the whole list of available FPs, effectively it says "There are no FPs available for this ride" when it means "You already have an FP for this ride so you can't book a second one."
Again, I don't expect this to impact your planning, just wanted to point that out since I didn't see that anyone else did.