I’m still torn between cutting the evacuation and leaving it in, but for the following idea all that would be gone.

Have the movie open with first couple of scenes with Rey and Luke on the island. Right after Luke says ‘It’s time for the Jedi to end’, cut to the kids on Canto Bight playing with their Luke doll, and the slave master ruining their fun. Cut before the magic broom. Perhaps have some shot establishing that they are caring for the animals, then begin the Canto Bight scenes as edited.

In this way, the Luke doll acts as the thematic visual link between the casino and the primary plot, and it more organically sets up the final shots of the movie.