There's LineageOS. Not sure it is worth the effort to switch just for this though.

Which is also the solution for "OS gorilla". Use Linux. You have a vibrant ecosystem of distros, they work (as much as any OS), and you are free to mix and match. No need to stick to OS that changes under your feet with no recourse.