I'm not sure it's the right solution, but I've heard it suggested that folks build a redhat-like bitcoin implementation. It adds incentive diversity in addition to implementation diversity.

To be clear, I'm not against nonprofits generically, but with all the qualified ideological folks getting grants, who is left to build for-profit bitcoin-involved ventures? Shitcoiners and masochists afaict.