Have you seen the mercury fork? it looks more aligned to your philosophy. I’ve tried it, and it seems very interesting. I’m not using it just because they’re often a few versions behind mainline, but it’s on my watchlist.