The Solution is SIMPLE
Think about it, there is a simple solution to the safety/security issue: Every single airline passenger that is not a terrorist (which in my estimate is millions upon millions to one) is now responsible for teaming together and pounding the everloving CRAP out of anyone who attempts any act of terrorism on a commercial flight. We need to publish this around the world and let them know that you wont succeed, you WILL get the S**T kicked out of you and if your lucky when the plan lands you will still be alive to be handed over to the FBI, IF YOUR LUCKY! Flight attendants could make a pre-flight announcement like this: Good afternoon ladies and gentlemen, if preparation for our flight I am compelled to inform any person(s) on board the flight today that if you have any intention of disrupting this flight, you will be prevented from doing so by passengers seated around you, additionally, you will be restrained by means of physical force that may include sever injury and or death to you. In other words, the (traveling public) is sick and tired of your crap and they intend to put a stop to it by any and all means necessary!