I’d guess OnePlus. Been a while since I bought my current Samsung, but I miss their better interface and battery saving often.

Though it truly is a shame that they started putting the fingerprint sensors under the screen, too. The meh sensor on the Samsung is possibly my biggest irritant. But reportedly at least the OnePlus one is better.