I think you can leave most of Canto Bight intact (with some small trims here and there), and even leave Rose and Finn in the stable discovering the Fathiers and the kids, however right after all of the creatures escape and rush out of the stable, and one of the kid whoops, cut to Finn and Rose running through the fields on the Fathier. You still keep most everything from the original cut in, just remove all of the excessive chase. This can also work geographically, since a stable and prison being next to an upper class casino doesn’t make much sense.