If you have used the EAD then you CANNOT use H1 to enter the country unless you wish to have your AOS case marked for abandonment.
Sad but true, hence if you have the alternative then work on H1 but travel on AP. Apply for AP real early (4 months prior to expiry of current AP), and in case you cannot get the AP in time, then you can travel on H1 while showing your 485 receipt at the immigration counter.