So here is something that I did. I contacted samsung after I had a catastrophic drop, when my custom rig was removed without the camera being removed first... (mostly my fault but still) so I contacted samsung, but I didn't mention the scratch at all.
In fact, I complained about the overheating, mostly because this overheating issue is ridiculous, and my camera overheats at much shorter intervals than what others have said theirs does. So I had a plan in mind, just send it out, see if they replace the camera, or fix the issue. I sent it, received a camera, and both lens covers were replaced.
Good Job Samsung. So glad you guys came through, especially after the debacle I dealt with for the Note 7.
My backup plan was to purchase a second camera, replace the lenses and return the product, which, obviously is not ideal as I would have taken a restocking fee hit, but it's either that or taking a 350 dollar paperweight hit. It didn't come to that, but if you have a US version, I would recommend sending it back for overheating similarly, in hopes they come through with the lens cover replacement.