I think the problem here is that OS itself was already on a SSD but the Windows EFI Partition is on the HDD.
The easiest solution is obviously to wipe and do a fresh windows installation, but its not an option as you mentioned.
Not sure if this would work, but You could wipe all other...