Ok so I figured the last 'failed' update was actually a successful update (the clue was the small file size i.e. it was the security patch). Finally this evening the full 7.0 update hits my device. Downloaded and verified. Hit restart and install and.... back to the your system is up to date...