I think you are still in H1b.
I used AP to come back (my I-94 was stamped with AOS) and continued to work for a while with the employer who sponsored my H1b. Two months ago, I changed my job, and my H1b got successfully transfered to the new employer. I got a new I-94, and new expiration date of H1b. Hope this info helps.