Yeah that seems to be the consensus and it makes the most sense to me. Of course that would seem to inevitably mean that Luke will have to die in Ep. VII. But if you want to see Waltz in the mentor role, you could always just watch Django Unchained. There were no lightsabers in the script, but it was pretty entertaining anyway, and I expect the movie will be as well.