Please for the love of god make harmbaton stun both, not just the batoner.

[Flourish]

stuff

You can shoot people point-blank with any intent other than help; disarm (which is what I usually go for) and grab also work. Yeah, beating people with a baton requires it to be off and your intent to be on harm, but all that takes is a c and a 4. I don't really think it's needless busywork, but more so a couple of deliberate extra steps.