Oh yes, totally...I think she'll scare a lot of Orc Army...when she'll unleash her full power on them. Not to mention she'll give Grima a good kick up the ass to earlier...Legolas has got to have the most awesome, kick-ass, beautiful she-elf for a mate lol :)
But yes, Haldir is one of her closest friends/mentor and more like a big brother at times. Kind of like the bond she has with Kili and had with Fili.