I disagree that it was the gun industry that started the war, but they absolutely fan the flames for profit.
The 2nd amendment will never go away as long as conservatives use it as a wedge issue. It's far too important as leverage, and they've been incredibly successful in cementing it further into law even very recently. My state just passed Constitutional Carry into law this year.