It’s the land itself that is most problematic. They only partially reverted it from the 90s makeover. Well, that and the fact that two core structures sit mostly unused.
IMO, use Aladdin rather than Moana. Transition beyond Pirates to a better-realized Agrabah bazaar, move the spinner and camels over to that courtyard, add a Cave of Wonders simulator, and revert the Adventureland plaza to something resembling its original theming. Moana is probably better for Animal Kingdom based purely on the kinds of rides it needs; they just need to properly frame it within an Oceania land unlike in the blue sky.