Took longer than I expected, but also recommend the improved phone-to-phone upgrade path (over iCloud backup)