refurbishment reccomendation wanted

[thx1139]

Short story- I have a datejust I purchased new in 1980, I'd like to get overhauled, and brought back to working as new.

Long story- for a present, my then wife had my crystal replaced by local watch shop. I went swimming with my daughter, and soon noticed water inside watch. Jeweler told me I should not swim with watch!!!!. I assume Sub-standard crystal installed. Anyways, they replaced crystal and a face which was much darker blue than original. I haven't swum with watch since, but have seen condensation inside when watch got wet. I'm sure statute of limitations have run out for me trying to get restitution from the hack jeweler, and my divorce is thankfully long past. I'd just like to get my watch back as it was.

Can you guys recommend a shop to refurb my watch? I'd really like the old light blue face as well, would a registered rolex outfit be able to figure out what was original to the watch? I'm in MA.

thanks
Steve