You're right, there is no option for "serious crime but only with warrant".

Option 1 is more strict in both ways. Only Terrorism (which is more serious than "just" crime) and even then only with a warrant. Option 2 is unacceptable (IMO). "serious crime" is too ambiguous and without a warrant prone to misuse.