No, I'm placing my bets on an undead Xehanort. So far, we've fought the darkness of the Heart, the shell of his Body, and now all we need is the manifestation of the Soul. You'll fight with three heroes in control of the two opposing races. One will be a Heartless with increased attack speed, and two Nobodies, one who hides in the shadows and bends Light, and the other that manipulates others, only to bring out unstoppable rage.

Although so far, I think I only managed to describe the final Protoss scenario of Starcraft. Oops.