If we're ever to transition from a world of adversarial nations into a free global society, we might need to stop teaching young men to identify as warriors.

It's a big if. More attention should be paid to how that happens, and more importantly how it stays a free global society. Because the risk of a global society that can't keep itself free might be greater than having competing nation states.

Although a gradual deescalation of national belligerence/defense and their means would need to go along with it, there would have to be much more done towards that goal for it to be achieved. Becoming less warrior-oriented would be an obvious afterthought with other groundwork laid.

Another potential solution, well-trodden in the past, is to silo the warrior culture and mentality, to not let it spill so much into the general culture. This is the idea of having a warrior class. Of course this comes with its own well-trodden problems if not kept in check.