Added lock screen pin to encrypted device - can't unlock on boot now
Since I have access to the recovery, I simply backed up everything, did a full-format (which wipes the encryption), restored, disabled the damn lock screen pin and then added the encryption again.

Not the ideal solution but hopefully helps someone in a similar situation.