Honestly fairphone would also be a good option. One of the most repairable phones, swappable modules (well, replaceable since nobody makes aftermarket modules), and they already have a history of working with 3rd party OS providers.