I'll disagree. To me, the problem isn't disarmament.
If someone is armed, a cop has the right to shoot them, as their life is truly in danger. I wouldn't expect an officer to put their life on the line to hand-to-hand disarm someone with a machete or gun.
The issue comes when the individual they are arresting is unarmed. If the cop cannot defend themselves physically, they have to use their weapon to defend themselves, which is what we want to avoid.