Have you read
A Pronominal Proposal? I think it does a good job of keeping the strengths of the new proposal (namely the clearer rules that reduce the variation in what different mods find to be a problem) while adjusting the “bigot line” you mentioned to a much more reasonable place