Maybe you want to try going back to your watch's service centre. Liek for example Longines last time I went to change battery at their service centre at menara boustead, they provide free cleaning/polishing as well.