As I already wrote, you don't need to install Win 7 on the new drive just to create the EFI and the MSR partition.
You can create both with diskpart...
My preferred strategy is to activate early in the rebuild process. No sense wasting your time with the rest if the activation process turns out to be...