I fixed it! I rolled it back to Marlin 1.1.6 and that did the trick. I used the 'official' Marlin+BLTouch build from the Creality website.