Sadly I think broad funding for non-commercial OSS might be an unsolvable problem, or at least a problem that can't be solved by a startup.

I'd like to see the government try and step in (a common solution to Tragedy of the Commons problems) with a grant program.