Adjustment of Status - I-485

We updated our address months ago through the AR-11 form and printed out the confirmation receipt. I've learned over the years to follow up on everything important, so my wife and I called USCIS about a month ago to confirm that our new address was indeed the one they had on file for each of our forms. We were told it was. Then, on October 28, we were notified that our interview had been scheduled and we would be receiving a letter with the date by mail. When we still hadn't received the letter by November 6, we called again to confirm that they had our current address on file. They confirmed they did.

Lo and behold, our letter arrived today, and it was mailed to our old address and forwarded to us by the Post Office. Luckily, we have over a month before the interview date, but I am at an absolute loss on what to do now - especially since my lawyer told me that the Post Office CANNOT forward green cards; they instead get sent back to USCIS and you end up waiting months (or a year) to actually receive one.

Has this happened to anyone else?? How did you ensure that future mail was sent to the correct address? Did you speak with a Tier 2 officer? I don't want to wait until the interview and risk the change not occurring in time. Thank you!!