I'm torn on this. It makes perfect sense to strike while the iron is hot with Ospreay, and I do think that Ospreay would have a better title match with Moxley. That being said, Hangman winning and taking the title from Moxley to complete his redemption arc would be the better story. I'm personally pulling for Ospreay, but I don't think you could go wrong with either one.
https://i.imgur.com/PmF1p9q.jpg