Many of the terrorists arrested are US citizens. The ACLU is already trying that angle to get them off.
Plus we are at war.
I vote for extend and expand but it ends when the war is over - and that may take many years.
Considering that war was never declared, I'm afraid I have to agree with your last point, it will take many, many years.