the sooner the better. If you have to go out of US to get your F1 visa, then your hu*****and's GC may be problem for you. But if you can change it in the States, then it should be a lot easier.
Or you can try finding another job asap and do a H1 transfer.
What did the lawyers suggest?