I have to say that this episode was pretty bad in term of following the actual fact from the manga.
First point I ve notice Zoro in the anime didn't cut the special force samurai that was kidnapping Hyori but he only push him away.
Second point is all the sequence with Sanji vs Drake, in the manga there are no hole that make sense for the anime to be field just watch the manga:
As you can see the manga show that Sanji notice hyory in danger (drake is still attacking sanji) he notice too Zoro moving to hyori all thing that didnt happen in the anime (so they are contradicting the manga which that not good).
After that we got this panel (there are no hole left to be field intelligently:
As you can see Zoro cut the ninja and then run away then we got Sanji comment about Zoro having a low bounty even this sequence was totally different in the anime than in the manga.
After that the manga chapter 945 moved to the prison. the only sequence that was like the manga was hawking vs law, even the Zoro vs Kyoshiro was not that different but still Zoro use 1 movement that wasnt present in the manga (which is not that bad compared to how the anime changed the clash between Drake and Sanji).
To conclud I ve serious doubt that this episode follow what the manga wanted but they prefer to put extra fanservice and change radically Drake vs Sanji by adding combos and facts like Drake falling to the ground before Sanji moving to save Hyori.