Struggling a little since updating.
One thing - the CloudFlare warning "CloudFlare plugin detected. We recommend removing the plugin as it offers no additional capabilities when W3 Total Cache is installed. This message will disappear when CloudFlare is removed." - even though I have removed the CloudFlare plugin and even deleted the CF files - the warning won't go away. At the top of every page in the WP admin.