How long has the SSD been used? Mines is only 1.5 months old (Just recently did an upgrade). I suspect that temps increase over time mainly if the thermal pad on the heatsink of the NVMe SSD for the samsung 970 evo - if that is you're using a heat sink for the samsung 970 evo ssd on a laptop, has already degraded or was leaking grease. If it leaked grease, the contact of the thermal pad will have been deformed by then resulting in poor cooling. The grease is non conductive though, but it does leave quite a mess if it was left accumulated in large quantities.
Yes, it is the correct move however to order a replacement as soon as possible before your warranty ends. I do think though that if no improvements are done to cooling in your laptop (which is admittedly hard to do because of the limited space), you will get the same result over time.
The Samsung 970 evo or the 970 evo plus for that matter uses the Phoenix controller, which is said to get quite hot. That's anecdotal evidence from other forums, but I do find it to be true. Exact specs and data on the controller however is nowhere near to be found.
I personally do think however that the 970 evo or 970 evo plus (they have such little difference btw such as in sequential read/writes), need to be cooled in proximity by a fan in order to better drop their temps. This can be done best on a desktop pc - with a chassis that haves a fan attached to the drive cage so that air flow is unobstructed. Just gotta keep pushing that hot air out of the way on top of the ssd and it will be cooled efficiently.