I am not sure that I agree with your ranking or combination of the two issues. Especially if we make the minor technical correction of changing the word "contraband" to the phrase "evidence of a crime".
Our police MUST be able to serve a search warrant to look for evidence of a crime. That makes the circumstances of the incident Involving Ms. Taylor of much greater importance. I am convinced that the police were generally right in serving the warrant and in the manner in which they did. I am also convinced that Kenneth Walker was well within his rights in shooting to defend his property during the incident. Much of the public (read media based) narrative on this case appears to be incorrect on factual specifics, which I believe is what led the grand jury to act as they did, with the indictments and lack of indictments.
Having said that, I have to agree with the concept of you other problem. Why is the US trying to ban drugs at all? What gives the government the authority to ban any drugs? Why did it take a Constitutional Amendment to ban alcohol (which is just another type of drug) but not take an amendment to ban these other drugs? And speaking of Prohibition, did our society not learn from it? You cannot ban any substance that people want to have. It just doesn't work.
Drug abuse is a problem in our society. It directly affects our national productivity and our national crime rates. But I believe we have successfully proven that laws banning them do not work. And all the war on drugs has done, in addition to helping the cartels and prison-industrial complex that you mention, is contribute to the greatest loss of rights by individuals since the founding of the country. Read SCOTUS cases and see how many of them come from drug cases.
I am a firm believer that the single greatest factor that would improve the relationship of the police to the community is if we repealed all of the nanny state laws that say what you can or cannot do when it does not directly harm another person.