Theory:Doctor Who television discontinuity and plot holes/Nightmare in Silver

When the Doctor refers to using up his current regeneration and not knowing what his next life would be like, is this a reference to the Valeyard, and thus the 6th Doctor reference for this episode?