Sounds like you’re gonna love my edit!
Glad you pointed out about Finn saying “so few wayfinders” I was going to look up the script to see if that’s what he actually said as he didn’t even know what a wayfinder was less than an hour ago.
The way I cut it was to use the 4 beat clean music clip from the opening segment over Finn’s line and overlay it with a cutaway to BB8 using the desert scene from TFA when he first meets Rey.
Yeah it was actually a little involved getting rid of that line and making everything else work. The problem is as he’s walking by he’s clearly moving his mouth as he says the line. I ended up having to foley in some more canister whooshing sounds and move one of Poe’s lines.