Who should i have? (chapter 4/5 spoilers)

[Mini Me]

I lost yoshimo at the asylum (woohoo yet boohoo) and when i get out of the underdark ill need a replacement. I want someone who mixes well preferably humorous and will not complain that i am an evil phsychotic bastard. He also has to fit the party fighting-wise.
My current party is:
Aginor Ravenwing (Moi) CE Dwarf Fighter
Weapons - dualwielding longswords (varies as i get new stuff)
Armor - Red Dragon Plate

Korgan
Weapons - Axe and shield (once again varying) plus throwing axe+3
Armor - Balduran's Plate

Viconia
Weapons - Flail of Ages/Shield
Armor - Doomplate +3 (with help from gaunts of ogre power)

Jan (cant have a decent party without Jan The Man)
Weapons - CelestialFury/crossbow always equipped (can bruiser mates be used without his special thing?)
Armor - His own

Edwin
Weapons - Staff of Magi (duh)
Armor - robe of vecna

I will be dropping this person for Savvy so they should preferably be a fighterish class i suppose so they dont get missed/interrupt the balance of the party
Thanks in advance for your suggestions
Yaargh i just hate the lack of evilness (i tried downloading valen but it wouldnt install!)

[Idioteque]

Jan will take care of all the theif duties for Yoshimo so I wouldn't pick up anybody else at all until Savvy. I guess you could pick up other NPCs and do their quests then drop them but I don't think you need to pick up anyone else except maybe Imoen for story purposes.

[fable]

Evil/neutral crew? Consider Jaheira. She's neutral, she's got Insect Plague (great spell), and she can resurrect.

[Mini Me]

if i pick jaheira will i still be able to do her harper quest (ring of wizardry woop)