>>> When I tested the install before I upgraded by pulling my datastore drives and booting the iso installer. All was well and the license said never expires.
I did not try upgrades with the free Hypervisor ISO image yet, so I can't tell you why that happened.
Anyway, I don't exactly understand what you did so far. Why did you revert to the original version after the first upgrade attempt?
Unless you enter a valid a license key (e.g. the one that you got with the first upgrade attempt) prior to the eval's expiration, the system will become unlicensed.
André