Why change what you got? If congress passes anything, it's time to take to the streets to peaceably protest. States that allow open carry should have large gatherings of people openly carrying. The cops/feds would do nothing about it.
Would you want to be ordered to break up that group?