Ok so no one.
Cuz a match wit Randy is not happening. Chalk that up for either MITB or SS
So that leaves a match wit MAYBE wit Riddle. Don't see that happening. But if it does...it definitely won't be for the title. And if it is...you already know Riddle ain't winning it.
Now who else? No one. So why bother having him compete in HIAC for no reason? Especially when it's right around the corner? You want him to have a match just to have one? Doesn't make sense.
Best bet...let that feud b/t him and Randy simmer until MITB or SS (which I see the likely choice). Bigger stage.