Well, not entirely the seamless upgrade I was hoping for, and in some respects a bit of a step backwards, but I've now updated my site and things are (mostly) working.
There are still a couple of bits I need to enable, but at least the site shouldn't rattle quite so loudly when you shake it.
The champagne is still on ice :-)