They are both correct but #2 flows better and is more often used. Your are also correct. Americans use "deal" but not always. I also hear "you're making a big deal of this" or "you are making this a bigger problem than it has to be".
Hope this helps,