Sorry to learn about your frustration, I wish if I know how to easy your pain.

Why should you be "less intolerant"? As long as you don't create a mess (I do) when they try to talk you into religion you should be as intolerant as you feel.
You have exactly the same right to feel uncomfortable and frustrated as anybody else....and trust me, the believers are champions at feeling offended when things do not as they want.

Honest... I am more frustrated when an atheist brings religion as a topic that when a religious bring religion as a topic. Lucky for me I am tolerant, very tolerant and not bothered by the little stuff.

I can pretty much tolerate it, except for when someone gets on their soap box (literally) in public and has a megaphone, or microphone with portable amp. That shit gets under my skin. It's annoying as fuck!!!

I don't think that you will ever be able to change a religious person's mind because no matter how logical your argument because, generally, religious people believe in changing the facts to fit their beliefs instead of changing their belief to fit the facts. If you are able to learn to tune others out it might make life a little less frustrating for you.

let em have it . both barrels. metaphorically of course

Not anymore. After a study of logical fallacies, it became kind of fun to watch them try to spin subjects/facts to fit. Most interactions end up with their side loosing their collective kewl

well, you can't change stupid especially when it's religious based, these people generally just won't budge why get upset about them. just rise above it as you are above them.