My understanding based on current publicly announced beta program descriptions is that they’re actually going the other way: they’re going to merge all of the existing smartthings-only accounts into Samsung accounts sometime this year.
They’re also going to combine a number of different apps into one app which will be called “smartthings” but which looks a lot more like the Samsung connect app.
I don’t know whether that’s going to make your issue better or worse, but changes are definitely coming.