For the class traits, I'd swap out Defiance for Now for Wrath (and do not unslot that trait until we get revamped). Relentless Optimism is a good second blue, and one of the best overall healing improving traits we have.
I would definitely work in Battle-master for your class traits - possibly slotting it instead of Turn of the Tide or Loyalty. While Turn of the Tide is a good trait, Battle-master, Adherent of Elendil, Renewed Voice, and Expert Attacks are better. Both of the herald traits, on the other hand, are ok for now, but will get progressively worse as you get closer to 2k might - the heralds don't scale as well as our physical mastery will, and will be left in the dust as you level. This is why many captains level with a banner - I still use a herald more out of habit than anything else.
Maley Oakensage, Captain of Elendilmir
Alas Elendilmir, may you *jingle jangle* forever in the Forgotten West