My issue with your interpretation of Rey in this film is at least partly connected to what you had Luke trying to teach her in FotJ. My idea would be to try and get it across that by the end she’s learned that lesson of internal balance.

The film already contains external manifestation that she’s trying to achieve it, she heals the serpent, followed by using Force Lightning. She wants to take Ren’s hand, but goes to her friends instead. She mortally stabs Ben, then heals him. Her issue is that she’s struggling and I would rather see her work through that struggle and come out ready to build a new order of Force users that isn’t Jedi or Sith, than die because she’s a failure.

It could be accomplished with two pretty simple changes to the Exogol confrontation and two during the finale.

When Rey says she’s here to end the Sith and Palpatine asks “As a Jedi?” change her “Yes” to a “No.” and edit Palps next line accordingly.
Then cut the Jedi from the sequence completely.
Show Rey’s friends on the Falcon with her as it goes to Tatooine.
When Rey is burying the past on Tatooine, cut the Force Ghosts and have her say “Just Rey” instead of “Rey Skywalker.”

With the changes you made for FotJ, plus the theatrical’s concept of Rey confronting her fear, this gives the very clear impression that she’s trying to move beyond the failures of the Jedi, and by the end has succeeded. She’s supposed to be the one who has resolved the Grey through refined Jedi sight, as referenced in the TFA novelisation’s Book of the Whills quote.

However it’s your edit, and those are just my thoughts on resolving Rey’s story.

As for Ben, I’d leave him on Tatooine at the end.