Personally I would classify them using a harm-based hierarchy, but I wouldn't retrospectively change the sentencing/legality that goes along with them.
Hope that makes sense.
My strategy is a gradual process. The first step is realignment based on harm.
Retrospectively to include alcohol and tobacco?