Well, for what it's worth, I couldn't get a reliable upgrade until I did the following:
1. Backup (using bundled Backup tool)
2. Re-flash.
3. Update (multiple times until you have the latest Diablo)
4. Restore from backup.
Seems to work...but what a pain!

- Jim