I also live in Washington, DC. I am in the Capitol Hill neighborhood. In addition to the sites you mentioned I recommend Union Station. It's got it all -- historic significance, architectural beauty, great restaurants (ranging from fine dining to mid-range cafes), also it has a fast food court and movie theatre. Oh, yeah, it also has metro and trains. It is also starting point for city trolley tours.

Erina