Sorry guys, I list that phone last week but had still not fixed it, I suggest you take this up with samsung as you might have warranty still. Sounds like its an unficable issue.
Or upgrade from samsung, im currently on the Huawei p9.. great bit of kit!