Forms are neat, a smug rival is cool and hopefully he's relevant. The red herring silly villain team though feels unnecessary. I would rather the sinister big bads up front than have the game play coy unnecessarily. Few people fell for it last time, no one will this time.
Though since they are doing this hopefully they stick to it this time and don't spoil the main villain literally a couple months before release.