Isn't the only option THE Brian Kendrick? He will be a world champ by then you know.
No, really, HHH would be good. With all this talk about Stone Cold, I think that could be an interesting matchup. Edge is also a good option, though I doubt that will happen.