Regarding installing the upgrade version...

http://www.pcworld.com/article/174710/microsoft_says_windows_7_install_workaround_is_legal.html

Because you're arguably building a new system, you'd possibly qualify for the cheaper OEM license too.

However the downside of that is you can't then legally move the license to another PC.