Party composition question - should I go for Rasaad, Branwen, and/or Edwin ?

I currently have the following party :
me (Elven Archer)
Imoen
Khalid
Jaheira
Kivan
Neera

At this point, I have Kivan up front with his halberd helping out with Jaheira and Khalid (mainly because Jaheira seems to really suck as a fighter, using a club)
I have Imoen and myself providing missile fire. Myself, longbow, Imoen, shortbow.

At the point in the game I am approaching (pre-Nashkel Mine), I am wondering if I should pick up Rasaad, and replace Kivan with him, or, replace Jaheira with Branwen, then bring in Rasaad to replace the departing Khalid. Also is Neera worth replacing with Edwin and would he get any aggro from Jaheira ?

Thanks !