Didn't Hasbro say at some point that they weren't going to pack "new" droid parts with repackaged figures, making it easy for long-time collectors to skip repacks and not miss out on the droids?
I think you have it backwards. Hasbro is going to package ONLY the current droid parts with figures. So if you get Wave 3, and it has a Wave 1 figure in it, it's going to come with whatever the Wave 3 droid parts are. This is to ensure that if a store gets a case, a customer could (in theory) buy enough parts to build the whole droid at once, assuming they were the first one to the shelves.
So if you're not a long-time collector, you're going to miss out on the earlier build-a-droids. This is probably (I assume) to encourage collectors to continue hunting and buy figures on sight for fear of not being able to assemble the droid. Or maybe to encourage case sales, as a case should always have 2 or 3 complete BAFs per box.
At the same time, there's some other variations out there. For example, there's a special repack case Entertainment Earth (and other online stores) sells with multiple Evo Troopers and Kashyyyk Troopers. Each one in the box has a *different* droid piece in order to "complete" the droid, meaning that's another extremely hard-to-find variant for those looking to get all figures with all droid parts. The Kashyyyk Troopers in this case have EITHER leg (one of each), and the Evos have both the torso and the head. So if you got this case and just cracked open the repackaged troopers, blammo, another R4-D6 for your army of dark blue droids.
It's going to get messy as we go, I'm sure.