Corridor in Laurel is going to have a better bottle selection than just about anything else around, they're roughly the size of a Wal-Mart. Some of the smaller DC bottle shops have let me down on quality in a big way even when selection looks good.
Definitely check DC Brau and 3 Star, and make the trip to Frederick for Flying Dog if you can, it's a sweet brewery. I haven't toured but I have heard, and I did catch a concert out in front of their hop vines this summer, it was really neat.
I can't usually afford to drink in DC (can hardly afford to work there, lemmetellyou), but if you make it 30 min north to Mobtown do Cooper's and Max's in Fells Point, Coopers for food and great beer, Max's just for tap selection. And Joe Squared... don't get me started. Clam and bacon pizza with a $20 pitcher of craft beer? B'more food makes DC look like Old Country Buffet (and it kinda is, isn't it?).
Check Cooper's specials before you go. I like to hit them on Belgian night, there's a full list of Belgians for $3-6. Mind-blowing food.