However Elrond isn't an exclusively hero-support. In fact, his old abilities make him a complete hybrid-hero (2 damage abilities, 1 hero-support-ability, 1 leadership and his refresh-spell (I don't know the english name, sorry), which supports heroes and troops (eventhough it benefits heroes much more)).
For now, I actually see Arwen as Imladris' hero-support, mainly because of her leadership, while Cirdan is Imladris' main-support for troops.