He said he was going to slap me.. (extended)?

My boyfriend and I were In the car, I had told him that someone had told some guys at a restaurant down the street from our job that I am the manager so when I go there they usually give me a discount. ( My actualy words were " I'm cool with them" but that's exactly what I ment by it) anyways so he was talking and by the things he was saying it sounded like an argument was going to start because he was getting mad. So I went over and put my hand on his lap going towards his penis and said "baby.." When all of a sudden he told me to get off him, " don't ever touch me again when I'm talking and I'm mad because I will slap the **** out of you, right in the face." So I sat back and didn't say anything he then started saying " jamie did you hear me?" I didn't answer so he kept saying my name like a good 5 X's. he then asked if I wanted to go home, I said " Yes" he asked if we were over? I nodded and said " Yes your dead to me! I don't ever want to talk to you, see you or have any type of communication" I will not tolerate this. He said he had told me in the past not to touch him like that when he gets mad and I just never get it I told him I was just being caring because we were going to argue over some stupid **** again. And he replied " yes but I told you I don't like it when you do that" I then said its never okay to say something like that. He said you know I'm not really going to do it I. Just said cause I was mad" and I said " IDC, were done." And he since he saw I was sticking to that decision he started saying how our age difference had to do with it (he's 4 years older I'm 19) and I should be more mature, how I'm crazy and bipolar and kept offending me. Long story short he didn't apologize until I told him that's what I wanted and he kept sayoing yea I don't think I'm wrong. I'm sorry for saying it but I was mad plus you know I wouldn't do it. I took him back within an hour of talking. Am I stupid?