While ATF does sometimes amend their interpretations, I doubt that you have anything to worry about. You are doing it by the book, and jumping through all the hoops.
The carbine you are making meets all current specifications, and you have been above board, applying for the SBR stamp of approval.
No idea about NM state law, but I expect that you have insured that you are in compliance.