I don't think Queen will be defeated right in the next chapter
He will probably fight equally but overwhelm Sanji next, then Sanji power ups and gets the advantage somehow
Then he beats Queen in another chapter
The same goes for Zoro. The pattern here light be: being overwhelmed after getting the advantage (or simply powering up), then needing something else more to beat the enemy.
There are more plots coming through aside from what we already have, like Apoo and Drake vs CP-0, so it's hard to predict how things are going to happen.
Overall i still think there is much more to go, Oda is making Zoro and Sanji's fights a real challenge