Thanks all for the help. I've now given up, but this is what I ended up doing:

* Installed CSSU Testing (had stable before) (and reboot)
* Installed power kernel (and reboot)
* Installed Pali's BME replacement (and reboot)
* Unloaded battery kernel modules
* Changed battery to full such that VDQ = 1.

Things I noticed, BNF stopped working with the BME replacement, which seemed odd. Device still "faints" before (at?) 3.3v, so I could never calibrate.

I went back to the stock (testing?) BME... and I'll deal with the uncalibrated battery gauge.