Decisions, decisions...
Some time ago Luxion was giving a free "upgrade" from Bunkspeed Hypershot to the same version of KeyShot v1.9; Web for Web, Pro for Pro. I think this offer is still valid even with the release of KeyShot v2. However, if you take some time to read through the
FAQ's on the KeyShot web site I think your questions may be answered.
In short, it seems that to upgrade from HyperShot to KeyShot v2 your only option now has an upgrade fee attached.
If you want to wait until Bunkspeed launches their new Shot product there may be an upgrade fee there also. They were offering free upgrades to those who had purchased Hypershot 10 before the stuff hit the fan with their licensing.
My own plan had been to wait until Bunkspeed launches, but that may be quit a while, according to their
forum they are still not ready to launch a beta product. If you read through the Bunkspeed forum there was quite a discussion on what the upgrade path would be for Shot v2.