Only for Waiver. The time should be enough. But the problem is who will sponsor your H1B. you current PI? or you have to find a new boss? good Luck!