I prefer option number 1 for how to get around Finn’s death. I’m doing something very similar in my TFA edit. Currently I have Rey crying, Chewie arriving, cut to falcon taking off and landing, and then right to Leia walking up to Rey and them hugging.
I think that hug really let’s the audience feel the weight of the deaths