Which units would you like to replace or add?

I would replace the Djinns with Dragon Golems from Heroes 4 (of course, adjusting their stats to level 5, since they were quite powerful in the fourth game). And I would give the mages more magical abilities to compensate for the loss of the Djinns.