Not necessary to return your vehicle back to stock if you're just updating the Tune Version.
As far as the limit on flashes goes, you pretty much got it. The tuner locks to the VIN and can't be used to tune another vehicle until the original vehicle is returned to stock, which unlocks the device. You can only change vehicles 5 times before the unit is permanently locked and has to be sent to SCT to be unlocked.