My boyfriend and intimacy!?

I agree with what you say. He does seem to have a temper problem, given how you conveyed it. And you don't deserve that. It is understanding that masturbating to and are totally different things, but he should be more kind to you. If he is not ready, he should respond you to more postiive rather than getting super defensive and thinking you're attacking him.