I would support "option 2", which is also what the centrist ÖVP-SPÖ-NEOS government is now planning.
After Austria's "Columbine" this week, they simply cannot do nothing ... and the attack has shown that some loopholes need to be closed.
Especially psychological data sharing between agencies such as from the army draft psychological assessment (which is very comprehensive) must be shared with psychologists and authorities that are issuing the firearm permits to private persons.
This is currently not the case, because of data privacy law. The shooter was ruled "unfit to serve" at 18 at the military draft, after a military psychologist evalued him. This was not shared with the authorities at 21, before he got his firearm licence and with another psychologist whose assessment was necessary to get the license.
Also, the age to get firearms in Austria is 18 for rifles and 21 for handguns. Maybe they will raise both ages to 22-26, because if they raise the age to 26, there would be no connection to high school anymore at this age and high school is often a terrible place with bullying etc.
Also, the psychological testing itself to get firearms (= required) is outdated: currently, it's a written test that is quite oldfashioned which reads "do you hear voices ?" and questions like that, which every person can pass. The government is now trying to reform this, so that a combination of several modern state-of-the-art tests will be used, also personal talks with psychologists, not just written tests.