Thimke Diamond Cutters is a great store for your jewelry needs.
I had my ring fixed last summer--they replaced the setting of the diamond, replaced some chipped amethysts, and shined it all up for me.
They did a great job and they send reminder cards so I can have it checked and be sure the work is holding.
They also clean for free.
The clerks are super nice!