I understand how it could be potentially annoying and misconstrued as a love declaration, however I do feel that it isn’t until Finn talks to Jannah about the Force that any sort of characterization for Finn kicks in and that’s deep into the second act of the movie. By having this running gag I think at least he has something and the reveal of his believe in the Force to Jannah isn’t as out of the blue.

Also by having Rey’s force whisper to him at the end of the movie, there is a potentially neat full circle moment as it harkens back to the change made in TLJ when Finn wakes up by hearing Rey. Just my two cents.