Does my HS TP make sense?

I was getting frustrated with the wait and start of AS2 so I added in a FPP to the tp )which I don’t actually have). I think his makes the time ls ore realistic and I can squeeze in McQueen before B&B. Otherwise I’d do it after launchbay and backtrack and probably skip mermaid since we want to leave the park early that day.

This a CL 3 on April 30. Plan to arrive 15-30 minutes before opening.