Game ballance - elephants dying too easily

Hi guys.
I just saw full Baktrian armoured elephant unit turned to run after single unit of pandrodapois(basic spear infantry without AP, althrough these had smith upgrade and 1-2 silver chevrons) killed two of them - it did cost it some mens(not much), but still - they seem dying way too fast to me(and also routing). The problem looks to be just two hit points - with relativelly higher attack strength of EB units, this seems to be a problem and armor is not helping too much(if it isn'nt armor points overflow that is). I was pretty scared as the skirmishers that were supposed to handle them were attacked by meelee unit and elephants had free route to spearmen, but it turned out they are not worth their cost. Please consider increasing their HP's, I would say to 5.
Another unit worth bit more balancing - Agyraspides phalanglitae of AS has same armour number as petzhetairoi - shouldn't it be little bit more(+1)?

The elephant issue has been brought up before and thier stats are possibly bering tweaked in the next release IIRC. The Agryaspides could possibly use the same armour as the Pezhetairoi although I'm not sure.

As per unit description, they use same armour, but some parts are better protected. They do have better armor stats as per unit cards, but not in game - of course I understood that they might be outdated and it's of course completelly up to you, in the end of list, just thought it's worth checking(considering the price difference 300 mnai also).