All of the suggestions so far are good (particularly swapping in a Versio for the Arbhar, as the Versio can serve any number of roles depending on what you need).

Ochd would be a wonderful addition to a case of this size.