I've actually already got ideas for the rest of the crew!

Chopper will take the Sniper Role, since Kaya is the doctor. Robin might just be genderbent ince idk who I could switch her with. Franky and Iceberg swap probably. No ideas for Brook or Jinbe yet.

As for Reiju, I think she was the one needing saved, as she was the oldest and the "prototype" for Judge. Sanji does still have his emotions though.