I think Maz Kanata didn't really convince as the new "yoda".
I think that part could be merged into Leia. She is strong with the force yet doesn't understand it. She could easily introduce Rey to the force and reckon her as a potential Jedi, offer her Luke's Saber and help her find Luke to start her training.
I think that part could be merged into Leia. She is strong with the force yet doesn't understand it. She could easily introduce Rey to the force and reckon her as a potential Jedi, offer her Luke's Saber and help her find Luke to start her training.