Drake's defection should have happened later imo and I would have preferred it if Who's Who came for Yamato instead of suddently change his objective and try to kill X-Drake. Plus it makes it even more all over the place for Queen to go from confronting Luffy and Zoro to prevent them from going after Kaido to suddently go after Drake.