I cannot take credit for this solution but did it last night and now have 4.0.4 with no fuss.
Go to settings,?apps, click on All. Scroll down to Google Framework Services and click on it. Press Force Stop, and then Clear Data. Now settings, phone, check upgrade. May need to do it twice.
No...