you also have to add in all the extra stuff required for safety on a car in the US. I'm guessing it would be closer to $25k.

I think your $2,000 estimate in US-specific cost is a tad (or über) low. There are other cost other than labour, there's price differences in steel, casting, supplies, and shipping of specific parts (especially ones from TSMC). Sandy Munroe has benchmarked the Model 3 to have a double-digit margin for Tesla. If Tesla builds a 0% margin (from say 10%) car, and decontent a few like, glass rooof, rear screen & seat heaters, etc... It'd be at best a $35k flat car OTD.