I was J-2 and currently is holding F-1. My OPT will be expired on August. I already found a postdoc position. Since I haven't got the waiver yet, I am not sure if my professor should give me HI-B or J-1. If it is J-1, will USCIS add another two-year home residency on me and evenually both my hu*****and and I have to get the waiver?