Sherry's is the closest one to you I can think of that has a surprisingly broad selection. It's more impersonal than Calvert Woodley so if you want a person to tell you what to get that's the better store even though their range won't be as interesting.

It's further, but I really like Ace Beverage. I'm more of a rum drinker and their selection is unparalleled within city limits. In general they have a surprisingly sophisticated selection given it's across from a big school (American University) and I've been impressed by the other stuff they carry in other categories. Bonus, they offer delivery (and do it themselves, not with some janky delivery service) within DC for a nominal fee which I use a lot because I live about as far from them as you can get.