After a week more of bitter struggle, I was finally able to execute the upgrade I’ve been working toward. Unfortunately, the resolution of the problem is not apparent. The upgrade wasn’t working, and then it did. Another week or so of fiddly bits will follow, I think.