The case was I would have a Katakuri vs Luffy fight but far less and not much spend time about the battle, the Katakuri fight was overall not the worst, the worst part was the whole wedding cake plot and Sanji not getting his battle with the Germa. In my opinion it was needed so much for Sanji and his character to have encounter with his family.