To solve the oobe problem you press and hold the shift key and F10 key together then click on the clock settings in the lower left corner of the screen then click on the home menu then update and security then recovery then select reset this PC and select keep my files, then click on reset. reset takes 90 minutes to complete.
Thanks Philip - I'll try this if I ever need to do a clean install of Windows 10 again to get past endless Feature Update failures...