Error updating Nexus 6 to 6.0.1

Hi all, new to the forums here. Sorry if this is in the wrong section. So I was trying to update my nexus 6 to 6.0.1 from 6.0 and I got this error

supported API: 3
Finding update package...
Opening update package...
Verifying update package...
Installing Update...
Source: google/shamu/shamu:6.0/MRA58K/2256973:user/release-keys
Target: google/shamu/shamu:6.0.1/MMB29K/2419427:user/release-keys
Verifying current system...
"EMMC:/dev/block/platform/msm_sdcc.1/by-name/boot:8393958:28495c2ab9b8a2210fc396d8af35c29bc885f ce9:8398054:bb5e73e0be23e9709b0acfd83db5c62140" has unexpected contents
E: Error in @/cache/recovery/block.map
(Status 7)

Installation aborted

Now I looked up status 7 errors and how to fix, but none had pertained to my particular issue, so I figured I'd check before doing anything drastic. For some info, I have rooted, unlocked bootloader, flashed a custom recovery and rom, but when Marshmallow came out, I flashed stock image for 6.0 to my phone through nexus root toolkit, which removed custom recovery, flashed to stock, but kept bootloader unlocked. So now I'm on clean stock 6.0 and I received the OTA and I tried to install it and this is the message I get. Any ideas on how to get my phone to update? Oh, and BTW if it matters, I'm on T-Mobile. Thanks in advanced!

Download from this link