J.J.
I highly recommend Dr. Mayo Friedlis with Capitol Spine & Pain Centers. The practice has an office in Centreville, but I believe he only practices out of the Fairfax and Herndon offices. Their website is www.treatingpain.com. Dr. Friedlis specializes in nonsurgical treatment and helped me recover from chronic whiplash resulting from an auto accident. I had pain in my neck, shoulders, and back for over a year and a half - physical therapy had not worked, but I've now been pain free for 4 years.
The key to recovery for me was prolotherapy - it's a series of injections of a sugar/water solution which irritates the muscle and causes it to restart the healing process. It's been used to treat arthritis and other joint/muscular pain as well - Dr. Friedlis is apparently the leading practitioner in this therapy. There is a lot of information on the practice's website about this and other therapies that they offer. Dr. Friedlis has a great bedside manner, and I wouldn't hesitate to go back to him if I found myself in a similar situation again.
Hope you feel better!