Ok - I restarted from a much older save file (just before the end of chapter 11) and it appears to have fixed itself now - not sure how helpful this might be for debugging, but here's the broken savefile (I've got everything fixed, just attaching it here for reference)
Gamei2.rxdata