I don't feel like Crocadille will be in Season 2, unless as a cameo. I feel Alabasta needs to be entirely its own season, due to just how important it is too the show overall.
Regardless, Mr 2 being a Genderqueer shapeshifter and very much Camp Gay in personality, and still managing to be one...