Like I personally think this IS the chapter for Oda to fully dedicate to their fight, considering last chapters title, preferably 2 chapters if that's the intent.
But I also wouldn't be surprised if he just shifts scenes again. I think its unlikely since it's never happened before, but I always feel like it's something he'd do.
There were tons of people looking at 1030 and thinking BM or Kid/Law would go down in 1031, yet here we are. The difference now is that the fight chapter was actually called, so I have a harder time seeing Oda shift again.