H.R.392: Fairness for High-Skilled Immigrants Act of 2017 proposes to eliminate the per-country green card caps for precisely the reasons you mentioned.

There is already a separate 50k green cards set aside for "diversity lottery", so that concern should not affect the desire to remove per-country caps for skilled immigration green cards.