Change to note 5?

Hi, so far my experience with the s6 edge plus is not so good. It overheats and sometimes is laggy. My friend who also bought the same model g928c from the same shop in UAE said his s6 edge plus broke because it overheated too much. I like the look and design though. If I sell my current s6 edge plus should I change to note 5 like my friend did? Or should I buy another working s6 edge plus? I can't return my current one because I live in the UK.