Actually, I think 2 units is absolutely normal. Making something like a mech dragon would be like delving way too deep into the HOMM realm.
The droids are cool as they are in my opinion
Although I admit that it would be really nice to have a mech army and a companion that boosts its "morale" (so to speak - let's say improving their efficiency, which should be the same as improving morale).