I think your lawyer is correct. You has better find someone who filed 485 and also got H1B in your school. This maybe helpful.
While everybody is trying to meet the deadline, I have been struggled to make the decision whether I need to submit I485 for the similar reason as yours. Finally I submitted I485.