Here's how you do it imo. You don't have Hangman win at All Out. Omega v Hangman goes to a 60 minute time limit draw with Hangman being the one to kick out of the One Winged Angel in the last few seconds of the match. It'll be a massive moment in Hangman's career and let's him keep momentum and fan support.
After the match CM Punk's music hits and you have him come out to face/attack Omega to a tremendous pop so you'll have face Punk v heel Omega.
As for Bryan I think there's loads of talent you could throw him with for his possible debut in New York. Darby, Ethan Page, Ricky Starks, MJF, Lance Archer, etc. They all work.