“When tyranny becomes law, rebellion becomes duty.”
Thomas Jefferson
You’d be crazy to not just amnesty register.
Embrace the NFA. Take the plunge and just be done with it.
I would suggest that if it’s an AR type, that you register as “ALL CALIBERS” on the form to give yourself all potential options...