Sanji will fight Queen but he will also give some kicks to Kaido later in the story. Nothing more than that though. I think that,when all the Supernovas will need some rest,characters like Jinbei,Sanji,Marco and Yamato will take some time with the Yonko.