This is why I've been on the Cody's win should be next year at the 2024 Rumble. Cause now, Sami is on Bryan 2014 status and you can see the parallels between the 2. Hell, Cody may start getting booed soon.
The way I would do it, is to have HHH personally come out and tell Roman you are ordered to appear on Raw next week and surrender the WWE title for his actions at the rumble. Reigns stay the Universal champion and face Sami at night 2. Meanwhile a no 1 contender's match for the WWE title is held in the EC. Winner faces Cody at Mania. Seth wins and we get Cody vs Seth in a ladder match.