I would dump Yoshimo!!! You are left w/out a good thief, but with Minsc (detect traps), Jaheira (detect traps), Nalia (knock), and Aerie (knock) you can get by w/out a thief. I really didn't find Yoshima a good enough thief to make up for his poor fighting skills!
------------------