TBH, my actual preference would be option 3 - revert all of chapter 4, fix things properly, then try again. But that seems vanishingly unlikely.