Putting fight aside, Oda made Luffy too cocky and overconfident, When Zoro and Law were protecting Luffy, he was doing his own thing, didn't even bother checking on Zoro. Not to forget lack of character moments in the raid, its all just get defeated -> gets up->fights and get cocky-> gets defeated.
Even WCI was better in that regard, with whole Luffy Sanji conversation.
But Oda said fuck Luffy, lets give spotlight to Zoro and Sanji.
Oda doesn't care about Luffy's relationship with Nami and Zoro, its always one sided, Luffy doing his own thing while Zoro/Nami just doing everything for Luffy.