How about, instead of being on one flight with one story and multiple destinations, why not keep those destinations (maybe) but they each have their own individual story line to them? And those are randomized.
For example, with Naboo, that's the only destination and you go through the ride doing whatever and the climax is helping to destroy the droid control ship. Kind of be like in the first movie, except its the Starspeeder that gets hit by a laser and stalls inside the hanger bay and then blows up the ship. Or just whatever the best way it would be. Just stating as an example.
Star Tours 2.0 lacks HEAVILY on combat, you are just flying around avoiding everything. Which is fine when it isnt done all the time, when it would really make sense to do so, and at moments it would be awesome and fun.
But of course, this is supposed to be a "tour" so that would have to be worked around. But this is a tour in the Star Wars universe, some action has to be somewhere lol.
Hope you all understand what I'm trying to say here, I'm not good at explaining stuff.