I think a lot on here would go with option 3: keep World Showcase as World Showcase. Just saying...
In which case, can we move Food & Wine, please?
Having just returned from WDW, I can tell you that WS is un-navigable (even in early afternoon), due to too many people, too many booths, too many new water-side restaurants, and did I mention, TOO MANY PEOPLE?
This was Hubby's first trip since 2009, and he was not impressed with all the changes. The last F & W he thoroughly enjoyed, but now vows to never return to Epcot during the Festival.
He also could not get over Off Kilter's replacement ... but that's for another thread.
Now with the food & alcohol additions to the Flower & Garden Festival, it's starting to feel like WS is just becoming one year-long food and booze fest. It seems to be less and less about showcasing each nation's culture, and more and more about selling mediocre food and over-priced libations.
I rue this more than the loss of Maelstrom.
If not for the American Adventure and the Mexico Pavilion, I would be just as happy to skip WS altogether; which makes me sad, as it USED to be awesome.