I doubt he's returning at all. WWE's not going to let the concussion master kill himself a little more under their watch, not with the lawsuits they're dealing with. I wouldn't be surprised if they just make him wait out his contract.
I think the third man is going to disappoint no matter who it is. Bryan would be the dream, but there's almost no way that's happening. I fear that it's going to be Rowan (which would make storyline sense I guess, but would be boring as fuck) or Kane (because they can't let those poor up and comers drown without a real ring general there to get yet another undeserved rub, right?)