Nah.  Here's what I think is gonna happen- 
  
[spoiler2]Smith and Clara go to Trenzalore.  Unknown to them, this is actually where Gallifrey's hidden.  Shit goes down, the Silence come back, and Smith sacrifices himself in an attempt to both stop the Silence (who have known all along that Galifrey's really just hiding and have been trying their damndest to stop it) and bring back his homeworld.  Enter Capaldi.   
  
A newly-regenerated Capaldi and Clara go to the returned Gallifrey, expecting to be lauded as heroes.  Instead, they're arrested.  Seems that the new President of the High Council of Time Lords has had enough of his shenanigans.  As they're about to be put on trial, the President himself comes to greet them.  He's the only High Council survivor of the Time War, the rest of them having been murdered brutally by what seemed like lightning only moments before Gallifrey was blinked out of the universe.  However, nobody knows who it is-he's got a face nobody's seen before.  Not even the assembled Time Lords really know who he is, just that he came out of the High Council's chambers wearing the President's clothes, and holding his tokens of power.  As Capaldi looks at the man, realization begins to dawn on him.  He knows this guy.  We ALL know this guy.  Just as the audience begins to wonder "Wait.  No.  No way." the man grins, Capaldi's face drains of all color, and the new President of the Time Lords begins to tap a beat on the table. 
  
A rhythm of four. 
  
The heartbeat of a Time Lord.[/spoiler2] 
  
Also, I just wanted to say how impressed I was-I wasn't able to watch it on TV yesterday, so I watched it live on BBC's Iplayer.  I'm betting that millions of people in the UK tuned in online, and the broadcast didn't so much as stutter.  Bravo BBC, thanks for doing livestreaming right.  It was absolutely brilliant.