How can I easily update the firmware on my T-Mobile HTC 10?

I have the T-Mobile HTC 10. I never converted it to US unlocked or anything. When I got it, I unlocked the bootloader, installed custom recovery (TWRP) rooted it, and slapped on a custom ROM (LeeDroid). I have a nandroid backup of my stock rom. I'm still S-ON.

Now I find out that T-Mobile has FINALLY pushed the firmware update. How I can easily upgrade the firmware on my phone?

What I tried was to backup my leedroid, restore my stock rom, and then take the update. But I got the corrupt file error.

No idea what to do now. I saw someone had a file of the OTA update (downloaded it), but I don't know what to do with that, or even if I can as I have S-ON.

How can I easily get to rocking the new firmware on my T-Mobile HTC 10?

Thanks!!

[XAP][1.0][Interop] RebootEx - Easily reboot to Flash mode or reset phone

Functions:

1. Reboot to Flash mode


2. Reset phone with options

Usage for phone reset:
There are three options:

1. Default Reset


2. Reset with SD card formating


3. Reset with user store data preserving (The phone reset operation will preserve certain data in the user store. Currently, the only data that is preserved is preloaded map data)(This is from WPBlue documentation, I don't know if it preserves something more in WM10)

Select one of these options and press Reset phone now.

Used capabilities:
ID_CAP_PARTNER
ID_CAP_REBOOT_FLASHING_MODE
ID_CAP_RESET_PHONE

Note: I haven't tried reset function, so feedback would be useful. I will try to add more functions in future.

Attached Files

RebootEx.xap - [Click for QR Code] (355.4 KB)