Disagree on the surplus military gear point. Are they fighting a war? No, they are serving a community. I think they would do well to split the police and tactical response forces into different concepts entirely.

Citizens are armed and that complicates things. But there are still two different tasks being done, one is supporting the community on a local level, and the other is exceptional uses of force to apply law. You shouldn't have the same forces doing both, which is more like how police were prior 9/11, if I had to put a date on it.