I agree with being diplomatic and non-confrontational. I've had to deal with the obvious problems associated with letting my Christian beliefs go as well. The best way I've dealt with the situation is to only share my beliefs when they're asked of me. It's difficult since I live in a household of fundamentalists who continue to preach to me and invite me to their Bible studies and whatnot, but I've found that I feel most at peace when I don't try to infringe on others' free will even though they do it to me. I try to practice the golden rule 
If you really do want to tell everyone, though, I would suggest you go with something more similar to the latter of your quotes, as being non-confrontational has worked best in my experience. I suspect it will work well for you too, better at least than leaving open the possibility of being interpreted as being hostile.
Best of luck!
If you really do want to tell everyone, though, I would suggest you go with something more similar to the latter of your quotes, as being non-confrontational has worked best in my experience. I suspect it will work well for you too, better at least than leaving open the possibility of being interpreted as being hostile.
Best of luck!