The program is the problem. Firms want indentured servants whom they can pay less money. While the Trump fees will suck some of this attitude out of the program, the people doing the hiring overwhelmingly want their own kind and will default to that position once Trump or his like minded people are out of office.
The long-term solution is either to keep a substantial fee in place or require a premium (such as at least 10% of prevailing salary) be paid to foreign workers. Japan used the latter strategy when I worked there for 14 years. It not only helped close the skill gap and encourage more domestic workers to get the needed training, it ensured the foreign workers were grateful to the host country for the opportunity rather than resentful over being exploited.
You can fix their wagon, by opening up 7-11 franchises everywhere! Watch out, Ahpoo!