The themes are what makes Disney so unique for so many years. It isn't just rides, they are stories and experiences grouped by a theme or feeling. Its why Princess and the Frog would feel weird going into Fantasyland despite being a fantasy story and animated.
Some would argue that "The Princess and the Frog" would feel even weirder in Frontierland, where Splash Mountain is found in Florida.
If the land was different, I'm sure the show building and queue would fit the altered theme. The story ending at his home isn't an issue as its the end of the story they are telling. Toad ends in Hell, Pan ends in Neverland, Alice ends at the Tea Party and nobody has minded that the story doesn't transport us back to a medieval courtyard. That's what the unload station is for, a liminal space to transition us from the ride's story to the land again.
I don't know what "liminal" means.