Yes, extend your H1b. 6 mon should be good enough.

I submi-ted my H1b on Feb, then got approved before June in CSC in 2007.Regular process.
Meanwhile, you will be still on AOS till you have a 485 decision. Technically, even you don't work, you can still stay, like those spouse. To keep H1 status, you must extend it without any gap.