The two step method is the way to go on this.On a clean machine... create a before snapshot... copy files and shortcuts... create an after snap shotthis should give admin studio enough information to create your installation package.
We have had our DBA run the following scripts (at AdminStudio Tech Support advice) 80ReconcileSchema.sql80Upgrade.sql and we are still receiving the same database upgrade message.