I would turn that around and say addiction should be more often seen in the context of self medicating: what issue is the person having that the drug is fulfill

I would turn that around and say addiction should be more often seen in the context of self medicating: what issue is the person having that the drug is fulfilling some important need for them, even if it is doing so in an unhealthy way? There usually is an underlying psychological issue, and this framing gives a path towards understanding and addressing it.