Yeah.
Of course that's all there is to it.
Guess we completely forgot the switcheroo after roofpiece, right?
"sanji is fighting black maria"
"sanji is fighting page one"
"sanji is going to the same place as jack. sanji vs jack"
"zoro going back to the rooftop"
Then, after Oda made sanji disappear and run around for 10 chapters, and give Zoro a deus ex machina senzu bean, it all to ended with the predictable route of zoro vs king and sanji vs queen.
SURELY that wouldnt happen here, right?