With Mastermind I was thinking a potential Norman, but also Helmut because why not.
You probably have a point about manipulation. I think it's cool to mix that and more action-y stuff here, cause playing Ms. Marvel seemed to make her a little more active. But I think the rest of the design can handle that.
I'll think on it some more, thanks!