Alderaan is definitely on the right trak here.
BUT No, I would not take in Luke as the Mentor for Rey in TFA. I too think that is a bland choice.
Otherwise your ideas make perfect sense.
Kudos!
And what is it with the rude accusations of other forum members. Very un-jedi:ish. Alderaan made a very good post. Thank you.