Which units would you like to replace or add?

Don't be so harsh on the Djinn. Play more as the Academy faction, and you'll understand that the small number of hit points is more than compensated for by their huge damage output.