you can install win10 directly using your win7 license key if you've already upgraded. I would definitely try that.

It's what I did specifically because I've never trusted an OS upgrade. OS's are too complex for that to work reliably in my opinion.