We're pretty much faced with my dichotomy now, though.

I'm not an anesthesiologist though, so I can't agree with that. Maybe there are alternatives. I can imagine there being workarounds or trade-offs which make more sense in light of these thoughts about i-zombies, such as greater use of local anesthetics (where it's very easy to test whether it works, as opposed to blanket general anesthetics).