You have in your midst a slightly relieved man. The auto-upgrade bailed on me, the alternative SFTP file transfer took three attempts and over an hour, but once the files were uploaded, including some older content I needed, the actual install went very smoothly indeed. I really must learn not to start doing these things after midnight though... :)