Eek! don't replace Anomen with nalia! Anomen rocks! and he is nutty when he gets to high level (as in ToB which you already said you will play). 2 mages is plenty for ToB so if you go with imoen and Edwin you will be fine (its crazy the amount of spells edwin gets too so no worries about not getting enough of the nice new spells in ToB
and if youwant keldorn I would suggest removing Jaheira over anomen. even though druids have some nice stuff in ToB Anomen is the better choice I think because his melee is better and he levels much much faster.