So, would you advise not installing the 4.0.4 update if offered or by trying forcing the update to come through at the moment?
After installing it do another restart. I've had zero problems since. I was someone who had no issues with the first 4.0.4 update.