For the record, I went with bzr uncommit -r -7 followed by replaying the (corrected) commits that I had just uncommited. This seems to have worked, but this was not a fun experience.