Well I just finished the system restore and almost everything seems OK (the laptop won't recognise my Nikon D7100 when I plug it into a USB port).
I use ZoneAlarm Extreme Security, so maybe I need to wait for an update to that before I allow the update to try again, or maybe I could try the registry edit myself.