Not really a solution at the moment if you do not want to give money to Google by buying a Pixel (hopefully the deal with Motorola will work).

Long term I would probably have more hopes in https://postmarketos.org/