The option of a previous Doctor intrigues me, I for one would love to see McGann given a run of episodes, perhaps a half a season where he returns to assist the 12th in some way?
Capaldi has been excellent so far but when he eventually decides to move on the BBC should avoid going for a 'star', the show works better when they're something of an unknown quantity.