The MAD needs to be rectified. Either Cha or Str, not both. Also, yes, their weapon selection needs to encompass more weapons aside from those two simple ones.

Longsword Finesse and Tunnel Stalker need to both have their SA die penalties removed.