I think doing things like this shows that the police are unable to use discretion in their execution of warrants, so my solution would be to take it away. Have

I think doing things like this shows that the police are unable to use discretion in their execution of warrants, so my solution would be to take it away. Have the warrants specify where, when, and how the search should be executed. Whether they're allowed to break the door down, whether they're allowed to be fully SWATted up, etc. Make it clear that any actions taken outside of the warrant's directions are done as a citizen, not an officer. Then penalize officers for poor execution of warrants, and judges for poor issuance of warrants.