That could be the case, the same way Oda nerfs Sanji by putting him to get some bitches, or play the white knight and get caught by the strongest female enemy in the arc, like Black Maria and her female subordinate, he does to Zoro with damage so Zoro doesn't keep fighting for too long and you have room to build moments with other characters, including moments related with the "nerfed characters", thats normal.
The Robin/Sanji moment with Black Maria, that even led basicly the whole fight for Robin.
The Sanji/Zoro moment when Law left the rooftop.
Queen clowning Chopper instead of killing him right away until Sanji arrives to save Chopper while carrying Zoro.
Luffy and Zoro facing CP-9, getting defeated and stuck in chimneys while Sanji goes to save Robin and Usopp from CP-9 in the seatrain
and many others...
This happens since ever, especially in arcs like Enies Lobby and Wano/Onigashima