I think entering after the 2-year anniversary is an extremely wise move. The determination of a 2-year card vs a 10-year card in not made by the CBP officer. That will be done, based on your records, before the Green card is produced. However, mentioning it to the CBP officer is wise, imo. Good luck.
If there is a mistake, you would file an I-90 (no fee) to have the card corrected.