I think that would be a challenge with the restaurant. You basically would have duplicate rooms / castles. I think expanding on Tangled is more likely than BATB.
To be fair, Cars Land duplicates the entirety of route 66 within the ride, which wasn't an issue then. I'm sure there's a way Disney could make it work