Wave 1 is all that is ever put out here.
Thankfully, it was very easy to order cases of wave 2.5, which included all of the wave 2 figures as well. You had to eat an extra Battle Kata Roadblock and an extra Wave 1 Snake Eyes, but other than that it was a great case. Much better than wringing hands over it and ending up eBaying after the fact.
I always order by the case. If the case breakout is really bad (including a lot of figures from old cases) I may only buy one and look for my extras in stores... but I always order a case. The chances of missing out are just too high otherwise, and I don't have the time to fart around going from store to store forever.
Wave 3 will be perfect for case buying as well... one of each new figure. Army builders may be an issue, but at least everyone can get one.