I guess we now change to "Under the Roof"-Piece.
Luffys fight is placed, Kid is arranged or in arrangement, now the other strawhats (and maybe alliancemember) get their time to shine in their fight. So they get their fights, while we get maybe one or two flashy moments of Luffy inbetween. Then we get hopefully kids fight against BM. And after that, maybe before the final hit of Kid hits, we get Luffys fight.
So i assume we only get Roof-Piece again when Oda is ready to finish the fights of Onigashima.