Meh, the 'war on drugs' is as much of a misnomer as the 'war on terror' ...media rhetoric and spin.
A couple of nouns and an adjective don't make for a sound policy.
I think the important thing to differentiate here is casual 'recreational' use of illicit substances by such folk as have jobs and organised lives who do not have their days dictated by a powerful addiction and those who are ruled by their need for a particular substance to the extent that they'll do just about anything for their need.
These latter need help and do not really deserve to be ostracized because of their
weakness.
We are meant to be a compassionate society now, are we not?