I am also in the same boat. I used my 2.5 yrs H1B & just got my H1b transfered to a new company . Sometime they will not change the expiration date on it & I think it  depends on how much time you spent on the H1B.