If I was going right now I would make the new Air and Space annex a must see. Also, the gem and rare coin exhibits at the Smithsonian are must see as well.
I recommend flying in to Reagan National and use the Metro and cabs for transport. You can save a bit of money flying in to BWI, but transport from BWI to DC will offset the cost savings, so Reagan National is IMHO a better choice.
If you fly into BWI, there's an express bus that runs to the Greenbelt station - you can take the Green line right into DC...
Plus, if the weather is nice, there is a certain "WOW factor" when flying in and out of DC with all the Memorial Buildings in plain view.