I have the same situation. I was told that some people applied for H1B without waiver, but not for immigration. But to be safe, I got my waiver prior to H1b application.