Fortunately the war on drugs situation is getting better, not worse. That momentum shifted several years ago in fact.
Incarceration rates are falling now. Legalization has gained a massive amount of momentum, obviously including the first two states, and the Feds are increasingly not willing to step in and interrupt that progress (including Holder recently telling the DEA chief to get in line with the new direction).
The rest of the world is going to relatively rapidly legalize many forms of drug use as well, with the US taking its boot of their throat on the issue. That will make it that much harder for the US to ever fall backwards and regain traction with the global war on drugs concept the government had been using.
That said, the militarization of police will likely continue regardless of the war on drugs ending. I view that as the next great issue to begin focusing on after several more states have legalized pot.
Also, mandatory minimum sentencing has completely lost steam. There is a lot of momentum toward rolling that back, and I think that momentum will continue. It's a failed approach, and a wide spectrum of people increasingly recognize that in my opinion. It will probably go out the window with the war on drugs. It'll be a huge victory if so.