Sure, awful, but HMD Global fixed the problem which I respect.

My other choices are Google (expensive, multiple Nexus letdowns in past), Samsung/LG (awful software), Chinese phones (crapware, I don't trust), Sony (abusive relationship), a bunch of other brands with other reasons I dislike, or iPhone (costly and I don't like the UI).

True. And i totally agree with your roundup of the main alternatives. I went for a Chinese phone last time and it's probably the best one I've had in terms of quality and features. But Lord knows what stuff I'm sending back to China. I've been meaning to try lineage out.