These clips share the same weirdness of Rey and Leia, then cutting to the Falcon exterior, then back to the group shot.
On repeat viewing, I must agree. I think just rescoring and replacing soundFX to end on the group shot is the best solution.
Or just end it with the Falcon flying away. I don’t see everyone’s problem with that.