Bummer about the break in. You already mentioned Proteus, but I'll just put in another plug for them. I haven't been there since I moved away from the area a few years ago, but they used to have great bikes and wonderful service. There are quite a few new shops in DC that I have not checked out but hope to next time I go up there. Not sure if you want to venture into the District, though.