CP0 should not have been a thing.
The HK fodders should have been used in Wano for negotiation and interference in the Kaido-Luffy fight, while the main HK force should have been deployed in Egghead.
Heck, the qilin has even been compared to a giraffe historically, so Kaku would've been redundant.
Send Shamlock, Qilin, and Stussy (later to be replaced by Gunkopop).
Having the masked hitman trade blows with Luffy before revealing his face as Shanks' would've been an utter shock. This in an arc filled with clones would have played out as a complete misdirect, before leading to the God Valley flashback, therefore to Garling and Shamlock. Then you follow that up with the actual Shanks oneshotting Kid, and the fandom explodes in disbelief at this redheaded family of powerhouses.