Luffy vs Kizaru and Zoro vs Lucci don't feel like their final fights for the arc
So if we go by the pattern of Luffy fighting Lucci first and then Zoro finishing that fight, I think it's not out of the question that Luffy will fight Kizaru first and then Zoro will fight him next.