1. I used both of these two

I94s (my case was similar to yours) and it worked.

2. H1B has nothing to do with EAD. But if you have gone through OPT, then you should have an expired EAD. If so, you should attach the approval notice of it.