Any word that covers both evangelizing religions and non-evangelizing ones is going to have the same problem. You could just use evangelist or proselytizer, so as to clearly specify.