I think that ultimately, because the movies did Finn such a disservice, the better move might be to minimise him, or at least this particular plot point, from earlier in the sequel trilogy. And I say that really, really liking Finn’s character and what he represents.
He gets an arc set up for him, then entirely ignored in the final movie. There’s no third act to his story. So I think that (for the theoretical first time viewer), he shouldn’t come off as a main character.