I kept telling people not to get their hopes up. Oda wasn't going to portray Luffy struggling against two Yonko Commanders during WCI, and then turn right around and have Sanji and Zoro 1 V 1 Calamities on Wano. He's not going to break a powerscaling he just established for Yonko Commanders just one arc later.