You would also need to cut around Jannah’s dialogue where she says, “Not by choice. We were conscripted as kids, all of us.” The way the scene is shot and blocked might be difficult to cut around. Maybe an insert shot of BB-8 from TFA could be regraded and used to hide the necessary cuts.
You also run into the issue of Finn’s name. You’d basically need to cut it in a way where Poe asks Finn’s name and he just immediately answers with Finn.