I am not very clear about the status of H1B holders after using AP and EAD. When my daughter used AP entering US, her H4 was surrendered by the officer, and was told that she didn't have H4 status anymore. However, I don't know if this is the case of H1B.
You may ask pjiang for suggestions as he has extensive knowledge on this issue.
What did your attorney say? If you can prove that you are still holding a valid H1B visa and didn't use EAD for work, you should be fine.
Please keep my posted with this issue. Good luck!