So the solution then is to remove permanent immigration quotas for skilled employees, right?

If there is no quota and no insanely long waiting periods for getting a green card -- H1b will become mostly irrelevant.