See - this is what I'm talking about - why pack Anakin, Vader, the Sandtrooper, and the Clonetrooper in this assortment at all?!?!
That means it's a wave of seven figures, make the cases 2x of Woof, Gamorean Guard, Ackbar, Wicket and Rebel Commando and one each of Luke and the Bar2-D2.
And then in the rev case, drop Ackbar and Wicket down to one per case and have Luke and R2 doubles instead.
Stupid stupid stupid.