I don't think you can apply for H1 since your 2 yr residency

requirement has not been fulfilled or waived yet.

You won't be subject to another 2 yr home country residency. You got this one through your hu*****and. That's all you have and you will continue to have it until your hu*****and gets his waiver. You will be automatically released from that requirement at that point.