Relationship advice please!! (It's long but I really need the help)

I have been dating my boyfriend for 3 years and for those 3 years I have always gotten butterflies just looking at him and thinking about him but 2 days ago we got into a fight and now that's changed. 2 days ago we got into a fight and he threatened to kick me out, so, I left. (Note: when we fight we always do and say things we don't mean which I know isn't great but ill get to that later) I brought all my stuff to my friends house and am now staying here. We got together yesterday to discus getting back together and setting some ground rules while promising to communicate better. So we are now back together (I am at my friends right now so I can bring my stuff home tomorrow) but all the excitement and happiness I get looking at him isn't there. I noticed it last night and had an anxiety attack about it and woke him up and talked to him about it. He said he's willing to stay with me and try to work it out. I don't want to leave him, I want to be with him forever. Is it possible I'm just feeling this way because subconsciously I'm more mad than I think I am? This has happened once before earlier in our relationship when we hit a rough patch and I had left him for another person. But after a few days all the butterflies came back and I felt like an idiot for even feeling that way. Do you think the butterflies will come back? Please please please help me. I know I still love him.