Unfortunately, he is going to switch places, have another cliffangher, switch places, another cliffangher, switch places have another cliffangher and then maybe in 10 or so chapters, we'll have the continuation of Chopper vs Queen, Sanji still running with Zoro wondering where they should go...