I also really want the TARDIS to break so he can't control it any more, like in the old days -

now that would be awesome! Yes, get us back to the days where Tardis takes the Doctor where he needs to go, not where he wants to go. There would be so much scope, instead of this *thing* we're getting which is supposedly character development, but is more like regression. (I'm still with catsdownunder having Merlin flashbacks, because I'd never seen characters go from three, to two then to one dimensional before)