Yes. I think so. However, it is likely to get H1 without waiver if you are lucky enough. You can get J1 again,but you still need to waiver of 2 years'requirement to get H1.
Did you mean that you got H1 after waiver? Please share and thanks for your reply.