The NRA museum is a MUST SEE for any firearms enthusiast. Like was said above, for an adequate treatment, plan four hours.
Also, since you will be in the area, you may want to check out the third floor of the Smithsonian bldg (I forget which one) It also has an exceptional arms and armaments display.