In addition to the National Archives, Air and Space, and American History museums, may I recommend the NRA's National Firearms museum in Fairfax.
The NRA museum is great, and it's free. Also I would recommend visiting the battlefield in Manassas.