Help with HS touring plan new & revised plan

Thanks for all the input. It wasn’t easy because the show times wouldn’t line up correctly but here’s my revised plan. Does this look any better? I’ve added notes to help explain my thinking.

The Great Movie ride is a Tier one attraction for fastpass, so you won’t be able to get that and TSM. It is a good fourth fastpass though.