Our academic system, especially in the research universities, is just fine. Nearly all the world's best research universities are in the US. Why? After WWII the US War Department concluded that math, science, and engineering were crucial for US national security, Since then Congress, via the NSF and NIH, fund the research universities well enough to make them lead the world. There's no problem with our research universities.

The supply of labor for software is a very different issue.