I would go for the villain too, but that's because I'm not a big fan of basic kits. Plus I think it would be hard to make a basic kit if there is no color swatch and it has to fit with all the villains. Then I think it would still turn out to be one of the kits, like everyone else's and not a 'covers all' kit. Know what I mean? And if it's just a separate kit like everyone else's, then I think you should go with a villain. But that's my opinion of course. You can do whatever you like!
