I'd go with shamanistic skills as well. Seems like their magic would amplify and synergize with a warrior the most. Earth magic allowing you to make your enemy unsteady, wind allowing you to distract them, fire allowing you to fight from a distance and/or boil your enemy inside their armor and water magic obviously allowing you to replenish yourself after battle.
If I was more limited and had to choose a school I'd go with earth or air magic. Earth would be great for sheer power and like A Chozo mentioned: allows you to control the battlefield, and air would be great for more agile fighting and more subtle advantages.