> I swore that this phone I am writing on will be my last Samsung of anything.

I have a nokia 7.1. Quite happy with it, as it came with stock android. Altough, the charger port getting loose is somewhat of a problem. Allegedly fixed in newer models.