Simple solution; require convictions. The problem wasn't with locking up junkies, the problems was doing it without due process.

Create laws against public drug use, then enforce them.