Just a short report of my progress:
Got my bootloader relocked. Followed post #26 and this did the trick:
Full flash of the stock rom.
Boot up the stock rom and do the inital android setup.
Reboot to bootloader.
Run "fastboot oem lock" it tells you to run and the command a second time so
Run...