BG2(EE)-Which NPC should I choose?

Last time I played BG2, I had the following party:

- Ranger (Char)
- Mazzy
- Minsc
- Jaheira
- Imoen (later)
- Aerie

I´ve nearly finished BG EE and I´m thinking about BG2 with importing my actual Char, a pure Mage.
That party will have more spellslingers than melees, but which melees should I choose?

It can´t be Korgan because of his evil alignment, so there are:

Mazzy:
Love her. Cute little tank.
But: With 5 points in shortbow and 3 in short sword, she isn´t really as good as I would prefer for the better weapons like Flail of Ages or Crom Faeyr. There aren´t many very good short swords till ToB, so...

Minsc:
Nice an funny. And someone, who can dual-wield Crom Faeyr and Flail of Ages.

Valygar:
Never had him for long, now I need him for claiming the sphere. But should I keep him?

Keldorn:
Paladin = Carsomyr. Nice choice. Perhaps him instead of Mazzy!?
Reason, I didn´t choose him the first time: I don´t really like Paladins...

If I remember correctly, these are all not evil-aligned possible melees. Perhaps Anomen, but he´s annoying...

Sure, there might be new npc in BG2EE, but for now, these are the options.

There are 2 free places in the party, I thought about playing.
Fixed places:

1. Char (Mage)
2. Imoen (later); this ist the placeholder spot for changing party members to solve the quests (Nalia, etc.)
3. Jaheira; I like her, I like the Harpers, I like her spells...can she perhaps take the role as a melee?
4. Aerie; I want a cleric, I hate Anomen, Viconia is evil...not much choices...

Any suggestions how to built the party?
Thank you for any answer and sorry for perhaps the little bit humble English; it´s not my native language.