Why don't you just go to your service center and have them put on new headlights for you. If they put on the new ones then that's good, if they put on the old style, it's obvious that the new ones wont work on older cars.
To me, it's really stupid to change connectors for new headlights that are the exact same shape. Software can be upgraded to control the new lights, the new light should have been designed to plug and play with all Model 3 and Ys, that way you don't have to keep old stock around just for warranty. Very stupid if they didn't do this.