Rebel team help

So I have put together a rebel team to be my second team
Currently its
Wedge (Lead) (7*)
Biggs (7*)
Princess Leia (4*, 1 shard away from 5 though)
Old Ben (5*)
Lando (4*)

I just unlocked R2D2 at 5* and can't currently get him any better. Should I put him into the team and over who?
I also have Chirrut at 5* though I do not have Baze and I have heard that you don't want to use him without Baze