Start the waiver process now. It is multi-staged, and takes several months if everything goes smoothly. You'll need a no-objection letter from the embassy of your home country. This is usually the most tricky part. Once the US Department of State gets this, you can track your status online. Start now so you are done with it by the time you finish your postdoc.

Re the O1, read up on the requirements, and work on publishing more during your postdoc.