The H-1B count should be cut to ZERO.
No one needs them. NO one.
The visa has to be eliminated.
Any modification to the existing H1-B will have immigration attorneys looking for any possible way to exploit any unintended loopholes.
Whatever...that would destroy the economy. I had an H1B and no American could do what I do. The proposed change to market based admission is great - salary instead of lottery.