Could you find a way to change the reason Finn and Rose are arrested? In the movie, they are bizarrely arrested for a minor parking violation. It would be more logical if they were arrested because they were identified as members of the Resistance.
If that’s possible, edit it so that Finn and Rose leave Canto Bight in the same ship that they originally landed.