Cleveland Park Wine and Spirits has a decent selection and the staff has always been able to help me find exactly what I'm looking for - never been disappointed yet!
Also gonna second Sherry's in Woodley Park! They have an unbelievable amount of options.