I've seen a few people mention the idea of Umbar having cavalry as bodyguards. I would prefer them to be infantry. We already have Gondor and both Rhun and Harad using cavalry for bodyguards. And I see Umbar as having mainly an infantry roster, with maybe one unit of Harad cavalry as mercenaries to hire.
@alreadyded I like your unit ideas.