I think the change will come through total surveillance, mutually assured destruction for nation states and genetic engineering for asymmetric threats.
When technology advances such that individuals have the power to cause massive destruction in lone wolf attacks, and science advances to the point where we have the ability, we will have the choice of whether or not we will allow traits such as psychopathy to continue in the gene pool or to be edited out.
We will come to a point where we will just not be able to tolerate the destructive power of anti social individuals.
I think we will edit out the sadistic, dominating and anti social parts of our nature or we will become extinct.