Help deciding who to replace on my arena team

Right now I am running a rebel team plus Boba. I managed to get Baze as my free chromium by re-rolling several times, so I started farming Chirrut out of the shipments. And I am about to unlock him, ...