Your 485 may be invalid after you get new H-1B and I-94 since your I-94 number changes and it is the ID of your 485 case at CIS. Please consult your lawyer for details. Why don't you apply for and use AP?