It seems you have excellent qualifications and background for either EB-1A or EB-1B. Your lawyer is also very confident on your EB-1A application. So, you may just go for EB-1A if it is not convenient to get the new recommendations for EB-1B, especially you have had O-1status already which is very helpful to your EB-1A application.