Congrats on the new job, and welcome to this part of town. I don't get down to DC much, but if I did, I'd check out Shelly's:
http://www.shellysdc.com/
I'm pretty sure that place is on the metro, though not sure what line. You're right about the smoking, indoors will only be at cigar shops.