I would prefer to see barbarians removed, because the greek cav is slightly weaker and one could always hire barbarian mercenary cavalry. Another reason could be that gallic swordsmen and skirmishers are already present in the roster .
This way you can have hellenic phalanx, gallic auxiliaries and spanish cavalry.