Relink upon EB1 I-140 approval is better. Write that clearly in your new I-140 package cover letter.
If you file a new I-485, you do need I-693 that was signed within one year, but you can go back to the same doctor and maybe he/she will sign a new I-693 without check-up again.