I wonder if they could eliminate "Enchanted Tales with Belle" and put in a PatF ride there.  I'd prefer a boat ride as the ride system choice.  The sightlines to Beast's castle atop "Be Our Guest are one of the casualties.  They could make the ride two levels with a small drop, similar to PotC, and thus keep the footprint efficient.  I haven't been able to fit the theme into that area, though.  It would work perfectly in Disneyland near New Orleans Square but WDW's Magic Kingdom doesn't have a New Orleans area.  Even Liberty Square is an odd fit.  The other potential would be to theme the exterior to either a swamp or a mansion with a manicured garden.