O1 is actually differently from EB1A. if you look at the criteria for O1
listed on the USCIS website, you will find it focuses on "national or
international recognition". it is more important to emphasis on recognition.
Your independent letters from established professionals prove the
recognition, a much lower standard compare to EB1a. EB1a focuses, however,
more on the significant contributions. You lawyer is doing it right.
If you want to use your O1 materials for EB1a application, unless you have
solid proof to provide for significant contributions, you should completely
re-write the PL>