warlord/noble/tactician, or whatever you want to call it. battlemaster is too light on buffs/manuevers and too heavy on damage. something more advanced and complicated (in a good way).
4e ardent, under the psionic/mystic class. the passive concentration mechanic is spot on for this.
shaman (4e and 3e), while i could see it under druids (expend wild shape to summon a spirit, thay you can cast spells though), i think there is some good mechanics to explore here worth it's own class.
swordmage, which could easily be a Oath of arcane paladin, and a few new smites.
artificer, including golem master, seige engeneer, trapmaster, and alchemist sub-classes. more vancient style, where you prepare things ahead of time. i.e. you make 5 fire potions, 3 oil potions, and 2 healing potions at the start of the day.
4e warden, as a defensive barbarian sub-class. werewolf could fit here too.
edit: i could also see a defender sub-class for the fighter. and a jester for the bard.