Eh, I've gotten over the headphone jack thing. I just buy a dozen adapters, stick one on each of my headphones, and replace them as they wear out every couple months. Good enough.
I still have a small amount of hope that someone will make a modern, well supported ~5" Android phone. But that's also feeling less likely.