@skquinn actually a lot more smoothly than I thought. What tripped me was relative links instead of absolute links which wasn't quite the fault of the method I used to update with.

So...initial upgrade, less than an hour, followed by (this morning) about 20 minutes chasing down said links (since I moved from one directory to another in the process).