Feel for you ....would drive my OCD. into overdrive

If i were in your shoes I think I would drop it into AD and ask them to send to Rolex ...looking at it I think they will be able to rectify to a more than acceptable standard.....

Then shove in safe or wear a squash band over it 