Evil-Lynn and Beastman for magic and classic henchman-ish-ness but 2002 Tri-Klops for mechanical genius (plus skilled sword fighter). Trap-Jaw is suppose to be a war tactician, not that they really show it.
Teela (skill) and Man-at-Arms, yes, but Orko has to be there for magic. They wouldn't need brute strength since He-Man is there already.
Lore might command him to be better suited to the role, but Tri-Klops is hugging ridiculous, and if you're going to have a guy who's basic deal is that he's been cybernetically enhanced, use the guy with the sweet gun arm and overall cool, menacing look, instead of the guy with three different eyes.
Edited by Chris McFeely, 28 April 2017 - 02:00 PM.