I didn't manage to solve the upgrade issue, but I did manage to get to the device with a small portable screen and keyboard. So in the end, I did a clean install (using the existing config.xml to restore) and upgraded that way.
With a screen, keyboard and 2.6-loaded thumb drive, the install was a piece of cake.