I agree with you 100%. End all special laws for non-profits. No one of ordinary means will stop donating to an actual charity if they lose their tax deduction.
See my post 18. I would argue that removing tax breaks for charities will do more harm than good. The welfare state must not be allowed to grow and prosper. Making things harder for charities would only add to and increase the need for a socialist welfare state.