Your lawyer is deadly wrong. Being "valid non-immmigrant status" is not a requirement for AOS. The corresponding requirement is the alien "was inspected and admitted or paroled". Since you were paroled when you entered last time, you are eligible for filing the second AOS.
By the way, you lost your F status after using AP. This is different from H/L situation.