You can also trade Thane for Wedge, adding K-2SO crew to Leia instead of Engine which is a pretty big deal. You would have to give up R2-D2 on Luke to get Wedge also. Not sure that would be worth it. Plus, Wedge isn’t hyperspace legal
I like to keep them lean as well. Since the Petranaki point change, I’ve been able to find success with the Knaves.
Han + Kanan + Trick Shot; 2x Knaves + R3 Astromech felt strong. I tried it recently on the Barons stream. I’ve generally found that I prefer the generic E-Wings over Braylen/Ten because of the dial and 3 agility.