Oda doesn't need to surprise us too much at this point. I think bringing satisfying closures to the story, and our main characters is far more important.
Anyone can subvert expectations but it does not equate to a good story (last Jedi).
Oda has nothing to prove at this point. He has beaten records after records and created some of the most beloved characters that will generate spin offs, possibly prequels, and movies even after its end. If you did not know One Piece is about to outsell the Batman comics in barely two decades without the commercial power of the US which is mind blowing.