You'd think Hero vs. Ki would be the logical next step. Or Hero vs. Claudio part 2 at the Anniversary Show since the top rope broke, and you can use that as a legit and logical way to have a (Hopefully better) rematch.
If Ki doesn't fight Hero, I'd be down with either Steen or Generico. Hopefully Steen, as that would be a HUGE first time match for PWG. In fact, I can't remember those two ever having a singles match together, let alone being in the same ring as each other.
If he was able to get booked for the show, I'd easily go with Ki vs. Edwards as I think that would be a pretty great 1-2 punch to whoever Claudio does against for the belt if it's not Hero.