Sugar Rush=candy/colorful objects=Fantasyland
Hero's Duty=cy-bugs/futuristic setting/extraterrestrial terrain=Tomorrowland
Solution: Have Sugar Rush by Fantasyland, Hero's Duty by Tomorrowland.
Of course that makes too much sense (as does using some of the space behind Speedway for a Tomorrowland expansion)
relocate Laugh Floor to DHS and use its building for a new dark ride, replace Stitch with a futuristic show, update Buzz and CoP, give Space Mountain a DL refurb, remove that Incredibles stage, and add a nice, enclosed Flying Saucers ride in some extra space... Tomorrowland might become cohesive.
Of course, Frontierland has an empty Tom Sawyer Island and some backstage space past Thunder to use, Adventureland needs an E-ticket, as does Fantasyland (SDMT and Small World are D+-tickets). Western River Expedition, a Geyser E-ticket, Frozen trackless dark ride, Fire Mountain... those four would essentially round out their areas.