Just FYI, for at least some period of time, the new scene for Star Tours will be the only one playing. So don't worry about trying to "catch" it. It will be the only one available.
I would definitely grab a FP for SM or ST first and then check out Launch Bay. I can only imagine the lines getting longer as the day goes on. Then once you've ridden your FP ride, grab a FP for the other and continue with the Launch Bay activities or Jedi Training, etc.