There should have been a new Disney park with Marvel and Star Wars as the headliners. Marvel wouldn't be able to carry the wait all on it's own (especially if the brand dies out somehow), but a four-land park like Epic Universe would have been fine.
That park could have had Pandora (west coast version), Marvel (New York and Wakanda), Star Wars (Galaxy's Edge with another ride or two and the entertainment that got cut), and Pixar. Tron could have been in the entrance area to keep it out of Tomorrowland (rumors keep saying that it'll go there). Problem solved.