That's one way to do it, but has the issue with the town screen been resolved?
Or, we could abandon Wintrial and, instead, create Lizardmen, and replace the Orcs with... Desert Orcs. Since demons always play the role of the main antagonists in Ashan, I think it would be more interesting if there were some other factions.
I came up with an Orc composition; I'll write it down so I don't forget later.
1. Goblin - melee unit
2. Gnoll - ranged unit (give the Swamp creatures small lizards)
3. Wolf - melee unit
4. Shaman - melee unit, spellcaster
5. Ogre - melee unit, tank
6. Troll - ranged unit
7. Cyclops - melee unit (and give the Mighty Hero a Wendigo from Wintrial)
1. Gnoll (melee unit)
2. Lizardman (ranged unit)
3. Orc warrior (wolves don't live in the desert)
4. Shaman
5. Basilisk
6. Wyvern
7. Cyclops
And I like the idea of giving the Chimeras Yetis (monsters)