I like option B as well! The dialogue feels more complete that way, and as others have mentioned, things that happen off-camera get referenced all of the time in Star Wars.

I also like the banter between characters; imo, it’s part of what makes the ST feel more like the OT than the stilted dialogue of the prequels. I’m not sure I understand what’s wrong with Finn’s “Always” line? To me, he’s showing some personality and establishing that these characters have spent some time together between movies. It seems like pretty economical story-telling.