I would remove citizenship revocation. It's unconstitutional. Other countries don't do it. I don't know what Mr. Opitz was referring to. You'll note that in the aftermath of 9/11, not a single U.S. citizen had citizenship revoked. Australia, as I read it, doesn't permit citizenship revocation in the way that Mr. Opitz described. In fact, the U.K. is one of the few outliers that do this. So it's not as if there is this worldwide trend against which we are now imposing a new law.
So get rid of citizenship revocation. I think our criminal justice system is perfectly adequate to handle crimes, criminal offences, and it does so just fine.
Second, I would get rid of the “intent to reside” provision with respect to putting that as a condition on the acquisition of citizenship by naturalization.