I know GrapheneOS are looking at other hardware sources due to those changes you listed but it'll unfortunately take a while. Hats off for being a Pine enjoyer though, anything to get away from Big G and frens' horsepoop!