Kizaru v Ranji could still happen. Kizaru goes to attack the strawhats on the ship and Ranji helps them out.
Zoro & Co go back luffy up against the Gorosei, but leave cause they're not defeating them here.
If this was Oda's plan from the get go, he did some weird shit getting there