That's not how most H1B visa owners work.
Truly the simplest solution is just to transfer the ownership of the visa from the employer to the employee. Because it's not the H1B worker who's the problem, it's the companies who own them.
If there aren't enough workers with skill Y, then sure let's get them over here, then you compete to employ them just like any other worker. Stop paying sub standard wages to your effectively indentured servants.