Is there some method to upgrade that's better than another? I plan on building a release from current in the next few days and trying again before I mention the panic in case it's fixed.
scp -r all the sets, then untargzip each one in / except etc.tgz, then run postinstall -s /wherever/etc.tgz check and fix what it reports.
John