Zoro and kawamatsu vs queen makes a hell of lot more sense. Kawamatsu has beef and history with queen seeing as he is the warden of udon, where kawamatsu was held. Zoro needs chopper, who is tied with queen. Also, queen is a throwback to both Kuma and kaku. He can do a sishisonson on queen like he did with Kuma but actually cut through the machine parts this time. Plus zoros traditional Japanese values and fightingstyle vs this new technological warfare and industrialization that queen brings is fitting and kinda irl historic.
zoro isn't done but asking for king is way to much. Think, killer is getting hawkins after taking minimal damage on the roof. And you want king vs zoro after zoro took maximum damage and needs medical attention. Anyway, if kawamatsu helps with either its 100% gona be queen and not king.
Sanji and izo vs king seeing as izo can actually be useful in long range combat and provide support from the ground via guns, and we already saw them interact with the disarm. unlike kawamatsu who is practically useless in that fight. Sanji is fresh vs king.
Zoro vs queen plus the roof still tops just sanji vs king so zoro will still have an edge in feats so there is no change to the dynamic. Same as in arlong park when zoro took havhi injured.