@mcc I got lost in this convo honestly. Minus the headphone jack, I would just get a Google Pixel (I typically find them $325ish new) and install something like GrapheneOS.
Get rid of all the bloat. Its super fast, snappy as any other modern phone. Top of the line camera. Check out MKBHD videos. Pixel always wins in blind tests.
If you want a removable battery and headphone jack , last one is LG V20 I think. I had one before Pixel but too slow and laggy for me now.