#2 AJ Styles

Like both Hardy and Joe, Styles and Angle first crossed paths during their tenures in TNA. They often battled each other for the TNA Heavyweight Championship and also were allied at various points.
Styles is still negotiating a new WWE contract, so who knows what might be offered to him in order to retain his services.
But like Hardy, any match between Angle and Styles at WrestleMania would be one between two stars who respect each other and who would give each other a good match.
Styles has wrestled great matches against practically everyone in his WWE career despite some strange booking in feuds with Shinsuka Nakamura and Samoa Joe.
Angle wouldn't have to carry the match as Styles could take care of that. The one reason why this would be an acceptable loss for Styles is because he doesn't need 'putting over' as he's in his 40s and an already established star.
It would be a better match than Shane McMahon, so if Styles opposed Angle in Angle's final match, I wouldn't be upset with that.
Major rumor about recently released stars HERE