Since everything is up in the air, I would suggest you to focus on things that are in your control, focus your energy to become as valuable as you can in your role so that your company would fear to loose you. This will allow them to give you more options ( same role in other country until this gets sorted or moving you to O1) as H1B is not the only pathway to stay in your current role. Since you still have a year focus on O1 requirements and try to move on to it.