H1b extension after using AP

I will visit China in May using AP, my current H1b expires on June 20. I am planning to apply H1b extension right after I come back from China which will be June 2.

I am wondering what status I will be then. On the H1B application form, Part 3 where it is asking for "Current Non-immigrant status", what should I put: AOS or H1B? I am assuming I will get a new I94 with "Parolee" on it since I will use AP, right?

Thank you very much for your kind help.