Is Jeff Hardy close to coming back from his injury? He'd make a great surprise entrant and a believable winner. Styles/Hardy is a believable title match also.
Not sure I agree 100% with your detective work there. Jeff was basically a midcard scrub going nowhere in a tag team when he left, and it would take some effort to heat him up again.