Yeah, I understand, it's a pain at the best if times having to do a reset but a nightmare if Smart Switch goes pear shaped. If I was you I'd bite the bullet, a faulty battery could deteriorate quickly so it may fail sooner rather than later. Plus having a phone looking for a charger, like a dog looking for a lamppost all the time isn't much fun.
to be honest I don't see that as a problem, that's what mines like and the s10 plus before was the same, samsungs are like 5.0 range rovers they just tear through energy, its the 1 poor thing about them, the only thing the iPhone can beat samsung is battery, I had a little 11 Pro with a 3000 mah battery is it would get me 8 hrs screen on time everyday without fail, I just accept with samsung that it needs topping up if you have a busy day
this was mine yesterday, to reach 6 hours I need to be using the phone solidly with hardly any standby time, I would also not make a phone call in the 6 hours, every single samsung I have had has been exactly the same and I have just accepted it,