You only made a mistake buying Builder's OEM if you ever want to migrate the Win7 license. It is locked to the hardware on that one machine. Any other version besides OEM can migrate as desired.

Upgrade licenses are all you need, as long as you have on hand a copy of XP/Vista to qualify under the EULA. But you don't even have to have it installed to install Win7.