In general, I would prefer more unique combat units, similar to those in the seventh game. For example, scripts could transform universal units into unique ones before a battle, even if they only have standard characteristics.
And universal ships could transform into faction-specific ships upon landing.