Thanks, you guys! I need a line from either Finn or Rose about the shuttle being found; I’ve previously been searching through existing material to find something, so I’ll need to write a line for AI voicing. Similarly, I need a line from Leia towards the end of the movie; I’ll rewatch the scene and write something for that too.

As I’ve currently got it, the Maz scene plays out the same as the theatrical version (other than quality of life trims) except I’ve dubbed in the Master Codebreaker music when Maz starts waxing poetic about him. Then when DJ breaks out of the cell, Finn and Rose look at each other and say, “The Master Codebreaker!” before chasing after him, with the Master Codebreaker music playing as they make the realisation, as both a setup and payoff thing to remind the audience and a punchline to end the scene. I’m quite happy with how it plays out, although I’d be interested to see a more drastic edit like you’ve described. That said, I definitely think changing Maz’s wording from “Only one guy I trust” to “Only one guy I know” is a great idea for a few reasons. It doesn’t imply that the guy they’re looking for will be trustworthy, they just assume that on their own; it also leans into what I like about Maz in TFA, that she’s friends with a lot of ethically dubious people but she’s quite aware and pragmatic.