I would prefer to have Luke in the role of the old mentor. If Obi-Wan does appear, he can be a hologram from his holocron that he (probably) made at some point. If that is the case, you can easily feature either version of Obi-Wan. Hell, you can even do both. McGregor for an earlier entry, Guiness for a later one.