I don't believe local optimization will hurt your national rankings. I do a lot of local search and still rank fairly well for some of my keywords on a national level. I actually believe that additional listings will help your brand name. Which will most likely help your national ranking. And who doesn't want a few more links?
I would advise against over optimizing your current site with local keywords. Don't change what you currently have going. Just add to it. Add your physical address to your contact page and perhaps create an additional local optimized page.
P.S. Google already knows you have a location and they do check your domain registration.