As a matter of fact, nothing really calls for amending the legislation, because the provisions that you described allow judges to fully take into account the danger posed by individuals in every case.
You are here to defend fundamental principles that are difficult to defend whenever spectacular crimes occur. You want us to continue following these principles that have been established over the centuries in the legislation of every civilized country.