I also want to upgrade, but it's difficult to pick which phones will have equally good fingerprint reading.
Also hoping for eSIM support, in case anyone has suggestions.
Note that S10 is totally different than S10e when it comes to the fingerprint reader, though. On the S10e, the power button is the fingerprint reader. The position is perfect. Contrast that with phones like Pixel 4 or Pixel 5, where Google think a sensor in an awkward location on the back of the phone is the right move.
However, both of them are leaps and bounds better than the optical in-screen sensors that fucking blind you if try to use the phone somewhere dark. I had a phone with one of those for about 2 weeks before I returned it.