This might be really counterintuitive, but expand the availability of high-school JROTC and match-shooting/biathalon (at least up north) programs. If the guns are going to be around, might as well instill responsible use of them from the teen years on. Make the association between gun use and discipline.
As an aside, I’d also support going back to 1960s and making machine-shop and home-ec programs mandatory (as they were in my high school in the 90s). A basic education in How Shit Works(tm) is as important as rigorous programs in languages, sciences, math and history.
