The lawyer is incorrect. It is not superseded. One enters US on 1 status (your is TN), You were granted an I-94 when your I-129 was approved, It continues to be valid. Both continue to be valid. It is quite normal (in fact required) for those working concurrently to have two or more I-94s proving two or more sponsorship.
No error of commission has been made by CBP (ie. they did not cancel your TN, and they did not enter you on another status), they merely gave you incorrect information that contradicted the correct info you got from USCIS.
As I said, you're TN that expires in November has never been online and never will, as it was not issued by CBP. It was issued by USCIS. Only I-94s issued by CBP are found online, No need for deferred inspection (as they correctly told you there is no need for anything to be done.
Again: take the I-94 that was issued at time of renewal, put it in your passport, and use this in the period after your other TN expires (or you quit that job). If for some reason you do not have that I-94 anymore, then if you enter US after July, show CBP the approval notice from 2021 (which they have already told you they can look up) and they will issue you a new I-94 for the remainder of its validity.
Bottom line: Obey USCIS when it comes to their processes (I-129, etc), and obey CBP when it comes to their process (border admission).