I certainly don't think he can beat it in timey-wimey cleverness. I do like that he's brought time travel to the fore this year, and got to break all the rules about it in the finale, but less of a focus next year would be a good thing I think.
I have a strong feeling Moffat will tie in this season with next season REAL CLOSELY.
Like Back to the future part 2 The doctor could revisit the events of "The Eleventh Hour" or "Victory of the Daleks"
"It's all the in past" means nothing for the doctor.
The eleventh hour doctor leaves
Series 6 doctor drops in
"Oh I hate repeats"