1. The biggest problem is ego. You may not see it, but when you get offended or are intolerant, it is your mind telling you that your comfort is more important than other's life choices. It's not an easy thing to solve, but this is the chief reason.
2. Never allow religion to be a home for intolerance. Whatever it may be, idk, but if it's Christian, the Bible says "and when they reject you and throw you out into the street, leave their house and their city, brushing off the dust of your sandals as you leave." In other words, when you aren't accepted, leave what traces you had of them behind.
3. They are individuals just like you. It's likely they have similar experiences and struggles just like you. Their problems may be uniquely felt by them in their way, but their problems aren't anything unique to them in the presence of all mankind. How they react to it may be their own way, but it's different.
4. As you've already started, that's great, but it's good to firmly believe that you should be more tolerant, but something that goes a bit further is to entertain the idea of forgiveness. What judgement and grudge you create, you hold on your own and are burdened by it. Forgive others, and forgive yourself.
5. Realize that at the end of the day, that anger and frustration meant nothing. To brood on it is your loss of what might have been well-spent time in thought or action.
6. Put the boot on the other foot. I can assure you that there are things that you do to piss others off. Try to be aware that you don't step on toes. Never concede to yourself that you are the image you hate to see in others.