It's such a relief to read that it is in good hands.
Do not even get it close to a Rolex AD unless you want to take it deep underwater again. But, even in such circumstance, the obvious replacement of most original parts is not worth transforming the watch into an assortment of pieces from different eras. Believe me I know what I am talking about.
It would be lovely to see the pictures once restored.