For Xiaobaitu: J1 Waiver after J1 to O1? Thanks!

Dear Xiaobaitu,
I am holding J1 and working at the university. I got a job offer from another institute which doesn't have J1 authorized. I am considering applying O1 and then PR, will O1 still subject to 2 years requirment? Will I need to get J1 waiver before I file my PR application even if I hold O1 visa? If so, what procedure do I need to follow, same as J1 waiver? Thank you very much!