There can be a simple solution - instead of measuring requirements for "highly qualified workers" by forced advertisements where companies try to get no 'qualified' people to apply, and having an "adequate" salary with the current principle "average of the same job in US", which can be manipulated and abused, why not just set simple absolute criteria?
Make sure that H1B positions need to have a salary minimum of, say, $100k (or some fixed multiple of USA median salary to be future-proof). That immediately ensures that (a) H1B's are used for all professions where high skills are needed, without a need to enumerate them in laws; and (b) H1B's are used to import skills instead of cheap labor, as for less-skilled jobs it would be cheaper to hire locally.