Well, there are more epic villains that aren't Maleficent you could use. You could use Chernabog, Dr. Facilier, etc. And as for the other Villains, that could work. You could even use the actual villains of that world as their henchmen or something. But are they all going to be insanely mad, or differ like the Org. did from each other? Like one maniacal, while one is sarcastic, etc.