Orc Cavalry, Hobgoblin Cavalry, or Both?

The finale of the (someday-I-will-finish) Elmö’s Obligation story will lead to Xenograg recruiting a young orc martial artist as a henchman. He will then recruit others of his species into service with Xenograg, forming a small combat unit (~25). I had envisioned them as heavy cavalry, on horses, but willing to also fight on foot. Their primary duty was to be a bodyguard for Xenograg.

Then the Elmö’s Obligation story gained an unexpected detail while being written: the young bravo (to be named Ingraf) who Xenograg duels was originally to be human but is now hobgoblin. He, too, has a small following of his own people. While not a henchman, this hobgoblin will become a loyal retainer. He will likewise end up leading another small combat unit comprised of his people.

The usual depictions of these species is of hobgoblins being more disciplined than orcs; more soldier than warrior. So should Xenograg’s new heavy cavalry unit instead be the hobgoblins? Do I change the orcs to heavy infantry? Do I leave them both as cavalry, with the orcs being reduced to medium?

I forgot one detail: these orcs are unusual within their own people, specifically that they are martial artists, and are more disciplined from it.