Hi,
I would not re-upgrade it now based on many hiccups from users around (and you). My suggestion: wait for few more months and hope Microsoft and all hardware vendors can sort things out. If you wish, may be once a week use Google search for "Upgrade HP envy 15 to Windows 8.1" to see a clean upgrade then you can try.
Regards.