Well, this isn't a timely post, but the best maps I've found are in the back of the Washington Flyer magazine, found for free at DCA and IAD (and presumably BWI). they have two pages of the most widely traveled places in D.C. for tourists with a metro map. Easy to tear out and carry around. On the page is a metro map.

And on two other pages is a decent basic driving map of the area.