Try removing Finn’s Force-sensitivity and making Jannah be the one who’s Force-sensitive (to preserve how they sense the thing on Exegol which would further result in destroying the Final Order). Finn being Force-sensitive makes him less special, in TFA and TLJ he’s just some average Joe who learns to stop running away and start fighting for the cause.

I know in the actual TRoS it is there as a way of reinforcing Finn’s attachment to Rey (he wants to tell her he’s Force-sensitive, which is a way of reinforcing his attachment; his arc is that he learns to move on from Rey, and once he does he’s no longer going to tell her he’s Force-sensitive), but try finding other ways to reinforce his attachment to Rey, he can still try to tell her something and he can still stop doing this after he moves on from her.