Need to get my M7 back to stock

Hi There,

I sat down at midday today thinking this would take me half hour at most! Im still here now at 20:45

I wanted to put my m7 back to stock, it had gone slow and I have very little time nowdays to update custom roms and stuff and just wanted the ease of OTA updates.

Well the first thing I found out was I couldnt find a RUU for my CID H3G__001

I then tried to get s-off with rumrunner. Tried twice, no go

I downloaded a nandroid for this CID, installed it and then flashed what i think is the stock recovery for this CID and all seemed to go well. It downloaded and installed 2 minor updates OTA. Then it showed a major update, downloaded it, went to install and failed in the recovery. Giving this error:

assert failed: getprop( "ro.product.device") == "m7" | | getprop( "ro.build.product") == "m7"

I have tried lots of other stuff today also but i think this is the most relevant.

Here is a getvar:

(bootloader) version: 0.5
(bootloader) version-bootloader: 1.57.0000
(bootloader) version-baseband: 4T.27.3218.14
(bootloader) version-cpld: None
(bootloader) version-microp: None
(bootloader) version-main: 5.12.771.3
(bootloader) version-misc: PVT SHIP S-ON
(bootloader) serialno: SH3AGW902831
(bootloader) imei: 359405053470793
(bootloader) meid: 00000000000000
(bootloader) product: m7_ul
(bootloader) platform: HBOOT-8064
(bootloader) modelid: PN0710000
(bootloader) cidnum: H3G__001
(bootloader) battery-status: good
(bootloader) battery-voltage: 4295mV
(bootloader) partition-layout: Generic
(bootloader) security: on
(bootloader) build-mode: SHIP
(bootloader) boot-mode: FASTBOOT
(bootloader) commitno-bootloader: dirty-1f512bb6
(bootloader) hbootpreupdate: 11
(bootloader) gencheckpt: 0
all: Done!
finished. total time: 0.092s

I dont need to make the phone look good to send it to htc for anything, I just want it getting OTA's so that the phone is low maintenance because I want to give it to someone else.

Any help would be greatly appreciated!!

Thanks in advance