Since your perm is approved, you can your I-140 and I485 together and applied your EAD card from your case. You don't need add your name from your hu*****and case if you think your hu*****and case is not safe.
If your 140 is approved before H1 expired, you can extend your 140 also.
If your 140 is approved before H1 expired, you can extend your 140 also.