What is done is done and cannot be changed on approved perm at least, so the only way to rectify is on i140 n hope for the best. N seems like people who have made mistakes on perm had corrected mistakes during i140 and got through per diff forums. Just tell ur lawyer to make sure everything is right in i140 n i485 and let u see the finsl paperwork before he files just to confirm all information.

Then now you should definitely go for premium processing on i140 so that u will know within 2 weeks.