That comment theorizing a half-solution of turning the figure 8 into an O actually makes a ton of sense. Keeps the riverfront aesthetic for Frontierland and Mansion, but opens up a ton of space in the back half.
Access might still be an issue, but I could see a path redesign around Big Thunder that works