Your case is confusing. You have not used your EAD and you do not have a H1B with the new employer now, why are you permitted to work?
Anyway it seems that once AP is used you can still use H1 for the same employer but may face problem for H1B transfer as on your I-94 it shows AOS, right?
Even when you ask lawyers you will receive different answers for such a case but may still be worth trying. Please share your experience with us.
Good luck!