If it makes you feel better Rob, Wave 2 is technically NOT a Hasbro product. Sure, Disney took inspiration from the old Hasbro parts, but these new Wave 2 toolings (bodies, legs, hats) are all Disney at this point - there is now Hasbro copyright on them.
I gave up on these long ago. I'd buy a "one of each part" set if they ever made it, but I'm not going to let not having them bug me too much.