Hmmm. This is about where it's no longer sensible for me to purchase by the case. Wave 2 already. If I allow myself to accept all troopers for opening, at two cases in order to keep a carded set, I'd be stuck with 2 Rey's, 2 Snoke's and 2 Kylo Ren's. 3/4 a case. 
I'm in the same boat.
I wish the Hoth Trooper was carried forward instead of the First Order Stormtrooper. This way, I could skip buying the first case and just get two of this Wave 2 case and then pick up a Vintage Carded Jyn Erso (which we all know will be the peg warmer) and a First Order Stormtrooper (which is coming 2 per case) from WM or Target.
Maybe I'll just take the approach of getting 1x of each case with this line - I have an "opened" Vintage cardback collection, so I would have wanted to get at least one of all of the repacks to open (as crazy as that sounds) anyway, so 1 Wave 1 Case and 1 Wave 2 Case results in:
3x Snoke
3x FO Stormtrooper
1x Hoth Trooper
2x Rey
2x Kylo Ren
1x Jyn
1x Death Trooper
1x Han Solo
1x Enfys Nest
1x Tank Driver
Fingers crossed that Wave 3 will at least have the three new figures carried forward and that would leave only the need to find a Hoth Trooper, Jyn Erso and Death Trooper in the wild...