Shutdown problems on upgrade to Windows 10

I upgraded my Dell XPS One 2720 from Windows 8.1 to Windows 10. One major issue - shutdown and restart failed consistently with DEVICE_POWER_STATE_FAILURE. I installed all the Windows 10 drivers as specified in the Dell support pages. After installing the new Wireless Networking and Bluetooth drivers the problems went away, but then came back after installing the Intel display driver. Attempts to reinstall the wireless network driver now fail. I have got round the problem by disabling the wireless network driver in Device Manager (I use wired networking on this machine) but this won't be suitable for everybody. Any thoughts?