Considering the fluff, I'd add the katar to discipline weapons. Punching daggers? Yes, that would fit here certainly.

The Battle Maestro feat... can it be used at-will, every round? Because then you would prettymuch always have a +1 or +2 bonus on attacks after the first round, no?