It's up to you...

For your long-term interests, you'd better to keep your non-immigration H1 other than take the short-cut of AP. This is my attorney's advice and also discuessed extensively in this section. Getting an AP is not that difficult as you imagined. Call the Embassy's Shanghai center (you have to purchase a phone card online with your U.S. credit card) and they will tell you what date would be the latest for an appointment. Usually no more than 40 days after the current rush season. September is a good time. You don't need much paperwork--your I797 (original) is the most important document. Must be original. Then, a recent pay stub may help. Not many others, really. It's much, much easier to get H1 than any other types of visa. The VO just asked when you were hired, what kind of job you do for the employer, no more than 4 questions. Good luck.