As you mentioned, decriminalization is not enough. The effort that was spent on enforcement needs to be repurposed on quality control. It's much easier to enforce laws on businesses who want to sell their products openly than on individuals consuming substances in private.
The FDA and DEA should be entirely repurposed to randomly testing all food and drug products and ensuring that the ingredients list is accurate to within a certain margin. Having a single arbiter of good and bad substances has proven to be a failure again and again (remember the Food Pyramid?). I would much rather have access to everything, and know that it is labeled correctly, than have some dysfunctional bureaucracy "looking out for me".
The FDA and DEA should be entirely repurposed to randomly testing all food and drug products and ensuring that the ingredients list is accurate to within a certain margin. Having a single arbiter of good and bad substances has proven to be a failure again and again (remember the Food Pyramid?). I would much rather have access to everything, and know that it is labeled correctly, than have some dysfunctional bureaucracy "looking out for me".