My problem with that running gag is that Finn shouldn’t have any reason to feel ashamed or nervous about telling Rey something as simple as “I think I can use the Force.” It feels like a bait and switch because 9/10 people would naturally assume he wants to tell her that he’s in love with her due to only being willing to share it prior to certain death. We already had enough subversion of expectations with TLJ and even in this movie itself with all the death fake outs.

All that being said, that is definitely where the plot line should be resolved if somebody felt the need to include it.