Also, you might want to give Adventure Scuba a try. The staff there is awesome and will go out of their way to help you any way they can. They also carry a wide range of goodies! Definitely my favorite shop!
SCUBA, Washington D.C., Northern Virginia, Maryland, SCUBA diving lessons, NAUI...