I would move Snow White's Scary Adventures into the Carthay Circle Theatre so it could be expanded and finally get an appropriate ending. Then disney could put in a new dark ride in fantasyland. Perhaps a beauty and the beast or a tangled ride?
Country Bear Jamboree since it was originally designed for a Ski resort in California would fit perfectly in Grizzly Peak. Autopia makes more sense being in DCA as maybe a baby car day care or something like that in Cars Land. Toontown actually came from plans for Hollywood area in Disneyland which included a Roger Rabbit ride so Toontown could fit in Hollywoodland.