Police ought to be part of the community, rather than some external paramilitary force. Their behavior would then be modulated through social mechanisms.
Also an excellent point. The selling of non-lethal weapons has been a several-decades long exercise in manufacturers lying about the safety of those non-lethal weapons. Rubber bullets, tasers, it's all bullshit.