Help S8+ Screen staying on while in pocket

I should also mention that I'm running Nova Launcher and NL Prime on this phone as well.

I noticed that the app I use to disable the Bixby button had an option to answer calls with just one click. I unchecked that and it seems to be doing better. I have had the phone have problems when I take it out of my pocket but I attribute that to the buttons getting dragged. I haven't had an issue with it just staying in my pocket after I answer the call from my headset.

A little update. I called Verizon Tech Support and the guy I spoke to was pretty much clueless, kept putting me on hold to ask his other buddies what to do. 45 minutes later, and all I've done is spend 45 minutes on the phone. Went to a Verizon store 3 times and they thought it was my glass screen protector. Took it off and problem still happens. Put the phone in Safe mode to eliminate all 3rd party background apps from running and it still happens. I took it to Best Buy where I bought the phone and showed it to their Samsung rep on site and she was puzzled, told me to call Samsung Tech Support. I called them and after backing up my phone to an SD card and doing a Factory Data Reset the problem is still there. Basically when I make a call with my Bluetooth headset or someone calls me and the calls ends, the phone screen stays on in my pocket. It is my business phone/personal phone and this presents a problem when somehow my text app will open and the phone will randomly text my customers and attach pics to them. Nothing to worry about with the pics, buy my customers don't really appreciate it. It has moved apps around the screen and just yesterday deleted a folder I created with 15 or so different direct dial short cuts in it. The ONLY way to avoid this is to put a pin lock on my phone or retina or connect the dots type of security. I DO NOT WANT THAT. I haven't had this issue with any of my phones in the past. In the past two years I've had a Pixel XL, iPhone 6S+, LG G4, LG G2 and none of them have had an issue like this. Samsung thinks in may be a bad proximity sensor. I tend to agree because with the phone in my pocket, and the keep phone screen turned off in dark places checked, and it being upside down, the screen still stays on during and after a call. I can't begin to say how many calls I've hung up on, muted, answered when I didn't want to, etc... This is getting old. I love both my Samsung TV's but this phone is making me hate the company. If I could afford to sell it at a loss and buy something else I probably would. I'll be sending this off to Samsung soon and we'll see how it goes from there.