Best replacement toons for commander Luke squad

I like using commander Luke rebel squads with toons like raid han, princess leia, r2 and chewie but I often run r2 in my resistance team in territory battle and sith raid and chewie is only 6 star at the time which keeps him from certain special events, sith raid and the final tier of territory battle. I usually replace chewie for chirrut but I cant use baze since he's only 5 star and have no ideas as to who would be good replacements for these 2 slots. And before anyone asks my c3p0 is only 5 star so he too is out of the question