HELP - Can't relock bootloader

Originally unlocked bootloader through HTC-DEV
CID: 11111111
Hboot 3.19.0.0000
Radio-1.2121331147A1.19_2G
M8_UL_CA PVT SHIP S-OFF

I'm trying to relock the bootloader so I can RUU, however keep getting the following error when running "fastboot oem lock"

Code:

---

(bootloader) [PGFS] partition_update_pgfs: pg1fs_security
(bootloader) TZ_HTC_SVC_ENC ret = 0
(bootloader) [PGFS] partition_update_pgfs: pg2fs_sec_recovery
(bootloader) Lock successfully...
(bootloader) deinit_lcd
(bootloader) mipi display off
(bootloader) mdp_clock_off
(bootloader) turn off fd8c2308 failed 1 times. Try again...
(bootloader) disable_mmss_clk done
(bootloader) pll1_disable done
(bootloader) TZ_HTC_SVC_DISABLE ret = -131073 (0xFFFDFFFF)
(bootloader) [CRITICAL] SPMI write command failure:                    cmd_id
 0, error
(bootloader) = 4
(bootloader) [CRITICAL] SPMI write command failure:                    cmd_id
 0, error
(bootloader) = 4
(bootloader) [INFO] Rebooting device
FAILED (status read failed (Too many links))
finished. total time: 1.230s

---

After the above message, the phone goes from unlocked -> relocked. However I believe the phone is still actually unlocked because I'm getting Error: 155 when I try to run an RUU. I also can see the red text on the charging screen indicating the phone is unlocked.

I have also used this method http://forum.xda-developers.com/show....php?t=2708571 to try unlock/relock, and also tried to relock and use HTC-DEV to lock but no matter what, I'm still getting Error 155.

Also, none of the user data is being wiped when I use fastboot flash unlocktoken Unlock_code.bin

Download from this link