For my edit, I wanted really wanted to try and play around with the ideas below but was not able to. If anyone else has ideas how to implement anything like this let me know:
Have Finn sacrifice himself at the end (but the group hug is great and hard to cut).
Have Finn be the one who destroys the Star Destroyer bridge, and he uses the force to do it.
Leia force heals Ben through Rey.