The Second Amendment doesn't live inside a vacuum. That doesn't mean that the NRA has to broaden their scope but it does mean that the NRA should also be keeping an eye on who is actively defending the closely associated rights, that we are granted by our Creator, and enumerated by our Founding Fathers in the Bill of Rights.
The NRA likes to say that you can’t have the first amendment without the second amendment. It also works the other way around. The NRA cut its own deal on the Disclose Act, i.e., it got an exemption.