Just do both, but update the original to match the new canon and have the sequel go from there.
The three best. 1) "You're a little short for a Stormtrooper.", 2) When she kisses Luke to put Han in his place., 3) Her acceptance of Luke being her brother. Plus an Honorable Mention, "You scruffy looking Nerf-herder!"
It's not just a Force Trial, it is a step on her path to becoming the first of the new "Grey" Jedi.
"Now, This is pod racing!"
I have to as well, I AM YOUR FATHER and the redemption of Anakin Skywalker.