Both of your views on the Christian church have truth.    There is no doubt that religious affiliation has been used for very human objectives of great, power, wealth, even pathological anti-social behavior.    It's also true that Christians have supported programs for the poor where none existed, worked hard for women's suffrage (and used against it as well), no doubt supported the equality of the races while at the same time was used to justify slavery.

My hope would be that readers do not jump to conclusions about those who are Christian, or Muslim, agnostic, atheist.     We might very well share many moral/ethical values with ourselves,  so creating barriers to understanding weakens a potential alliance.

Leave the Johnson ammendment alone.   It does nothing to inhibit the choice of faith practices.