Here is what I would do.
Phase One: Mos Eisley Spaceport
Retheme the entire area from Indy through the Sounds Dangerous theater to the Mos Eisley Spaceport. Where Indy is would be the hanger where the Millennium Falcon Walk-thru/Meet and Greet would be. The Cantina where Backlot Express is. Jedi Training Academy where Sounds Dangerous used to be. And of course retheme the entrance/showbuilding of Star Tours.
Phase Two: The Second Moon of Endor. Take everything from Star Tours to PIXAR Place (Muppets, Mama Melrose's, Pizza Planet, Streets of New York, Honey I Shrunk the Kids Playground, Whatever that Counter Service back there is called) and theme it to the Forest Moon of Endor with a Speederbike Coaster, Fully themed Ewok Village, a primitive looking flat ride, and food and beverage options.
And the best part, redo Star Tours to where the entrance is in the Mos Eisley Spaceport. And you get off on the Moon of Endor. And if they really wanted to get fancy, they could have half the cabins going from Tatooine to the Moon of Endor and the other half going from the Moon of Endor to Tatooine.