You might also consider exploring the Air and Space Museum at IAD. The Smithsonian A&S on the National Mall is nice but there is a second location at IAD with far more planes (they land at IAD and can be towed to the museum). If you like planes it's an excellent way to spend the time you have and avoid traffic issues navigating DC.