Denjiro showing up to steal Hiyori's win doesn't make sense. He thought he killed Orochi already. They moved on.
Now what we haven't seen is Orochi's actual power of revival. If somehow he gets the Kairoseki nail out of him, it'll happen. The only person I can see stepping on Hiyori's toes is Momo with Ame no Habakiri, because it seems like Oda is hiding Momo's Oden-like appearance for Kaido or Orochi to see.