#2 vs Matt Riddle, NXT Takeover: War Games - for the NXT North American Championship
If WWE really wants to utilise Kurt in the way he has been so far, then the best bet would be to push the part-timer to take a small tour of NXT. There's not only a litany of dream matches waiting for him, but he can even regain his groove back. A short stint on the yellow brand would do Kurt a world of good.
While it's doubtful WWE forces him into the UK NXT brand, a face-off against Pete Dunne shall ignite fan warfare. Yet the one person he might make a great pair with would be none other than Matt Riddle. An amalgamation of RV, Brock Lesnar and Kurt Angle; he'd put on a show with the resident bro.
Matt Riddle came into wrestling just a few short years ago, and his unbelievable rise as well as improvement has seen many comparisons to Kurt's own quick change from Amateur to Pro-Wrestling back in the day. A mat classic between the duo as long as Riddle is willing to control his strikes, is one way to get Kurt going. It'd be a refreshing angle for Angle to partake in.