Help. Relationship and respect

My boyfriend and i live together and have lived together for the past three years. The past year we have been fighting a lot and as of now we are trying to decide if we should continue or not. He cheated and so did i to start the relationship. Obviously it was wrong by both but worked out. Recently a “friend” of mine stopped being friendly to me. When we see her she is very cold and clearly only friendly to him. Last night we saw her , she completely ignored me. He commented that he didn’t understand - but he thought it was wierd and seemed like she definitely didn’t like me. Hours later, as i was waiting for him to come meet me she was silently waiting at the other end of the room. When he came out she suddenly was also leaving and was very flirty and chatty with him, he was holding doors ect for her and i was walking way ahead and not interested in interacting with anyone. We came home and i told him it was so disrespectful to not ignore her as she was doing it to me and that even he said that she didn’t like me. We fought a ton and then i finally went to lay down .... and as i was crying myself to sleep i was woken by him MASTURBATING because he thought i was asleep. I got up. I said it was disgusting. I was literally crying next to him, over the whole situation not asleep like he thought. I got up and slept on the couch. Am i over reacting? Or did i do the right thing and have respect for myself