The better solution is just stop H1B lottery from next year.
Realistically, the H-1B visa program should be terminated all together.