How about ending plea bargaining? If you did the crime, you should do the time. Plea bargaining is a form of selective prosecution and is abused.
Prosecutors are judged by their conviction rates, and plea bargaining is a way to improve conviction rates. If you can offer a mugger a deal where he will serve 6 months instead of risking being found guilty and serving 3 years, he will likely take it. The mugger serves less time and the prosecutor gets another conviction. The public, however, gets more crime committed upon them.
What's needed, instead, is for prosecutors to be judged by recidivism: how much crime is committed by people he let off with plea bargains. Change the incentives he operates under, and the prosecutor will be more likely to spend his time putting away career criminals, and will not spend as much time prosecuting people who unexpectedly had to change planes at a NY airport with a firearm in checked baggage.