I would change the definition of “public order emergency” to remove emergencies caused by threat actors, which is essentially what it is now. If Parliament wanted to have the ability to respond to emergencies caused by terrorism, subversion, espionage, etc., I would think that you would still need to keep that tied to paragraph 2(c), but if you wanted a public order emergency to actually deal with public order emergencies and issues around potentially critical infrastructure, I would change the definition of “public order emergency” to meet those requirements.
Alternatively, you could have a public order bill like the one the United Kingdom has introduced in its legislature. That provides specific powers and different offences around critical infrastructure and threats created by public order disturbances.