I am not sure if I understand how it would benefit the US if they implement one of the two or both of your suggestions. H1B isn't a diversity visa, from my understanding it is a work visa to bring in talent from other countries for jobs that can't be filled by US work force. Isn't that the reason it goes through the process of labor approval?

I think you are looking at things from the perspective of how if these were implemented in the way you wanted, it would benefit you and your situation but I think this country was built on the philosophy of "Ask not what your country can do for  you but what you can do for your country".

Working for a company thats always looking for great talent, I don't think I would support a system that might put a quota on great talent and jeopardize the productivity of my company and department. The domino effect of such could be that we hire less productive candidates because the quota for the country from which the candidate I like is over.

They already have a green card lottery system to support diversity in this country. This country has a great system and everything works as long as you work hard. I wouldn't want to screw it up, "Don't fix it, if it ain't broke" is my mantra especially after seeing what happened to Nepal where we went from bad to worse by the day.