I wanted to bring this image back to remind everyone about the current setup. Seems to me that the logical plan is the current track being FP+/DAS only and the new track being standby.
There wouldn't be a need to build much of a new queue at all -- you just reconfigure the current standby (dark green) a bit so that the end of the line passes Potato Head and ends at the upper left. From there you punch a hole in the wall to SS1, put in a shelf for glasses pickup and go to a new load area. They you do the track. The new track would roughly be the length of orange + light green/blue + red -- probably similar to light green but more compact. Even with the service area (the gray part to the right), you could do that in 2/3 of SS1. There would be room for something else -- like a queue for another ride or a M&G or a merch location.
The FP+ queue stays as the pink one. No need to change that. FP+ capacity is increased because you don't have standby people to merge with.