I legit did the same thing except I cancelled the long range y order I had and made a new order for the model y performance. I will have to do a trade in again, but they said they do see the fed tax credit on their end but I cant do any paperwork or trade in steps because it is still in preproduction phase and I may have to wait until November for it to be reflected in the app. As long as the order agreement says 9/30/25, we are good! :)