We're doing more "faux" breath play and less real. So instead of my throat he has my jaw, where there is the same idea without the fact of choking or cutting off air. Or he'll cover my mouth and nose and tell me not to breathe. But I actually could get a breath if I had to. Still occasionally the real thing, but nothing as serious as choking out.

And the safeword drills did seem to help. He doesn't really use a gag on me, so we haven't discussed alternates to words, such as the ball.