So after a few more tries I found that the stock recovery.img started working after I flashed TWRP and then flashed the stock one, no idea why this would fix it. The real problem with the OTA update was that my Super-SU install from before had modified the /system/bin/install-recovery.sh file...