If you don't need a working camera, a OnePlus 6 (or another well supported Snapdragon 845 device) should solve your main issues. Otherwise, there's the Librem

If you don't need a working camera, a OnePlus 6 (or another well supported Snapdragon 845 device) should solve your main issues. Otherwise, there's the Librem 5 - it's enough faster to make a difference compared to the PinePhone. As many people receive theirs now (who moved on in the time since they ordered), getting one that's barely used is a possibility.