A clash is due, right now or later, it will happen. Luffy and Lucci (somehow) seem all okay even after their fight, nothing to say Zoro and Kaku won't come out same. Unless Oda makes Zoro lose 1v3 against the CP0 to injure him again before a fight like he did in AP, SA and Wano.