Finally got it to work!
For anyone who finds this post having the same problem, I wish I had a clear solution, but I don't.
In the end, the update did work using twrp 3.0.2-3. The first 2 or 3 tries with that version didn't work, so I'm not sure why it did in the end.
The last thing I did...