I got this info from Tesla. It may be older info though. Will double check, not that it matters since I won't be buying a car from Berlin.
From what I can tell most of the hype over the 4680 battery is just hype since the composition of both 4680 and 2170 is internally the same. Only potential advantage being larger conductors on the 4680 between individual cells which may or may not make much of a difference. Most of the advantage is in less costly manufacturing processes used to make them which many hoped would be at least partially applied to reduce purchase price, yeah right....,
The different composition of the batteries in the M3 base, not to be confused with the two types already mentioned, are said to have some advantages. For some reason they tended to use those batteries in lower range models like the limited SR MY and the base M3. More expensive to make. Likely the main reason they have discontinued the batteries in addition to the different properties lending themselves better to lower range cars.
Looking into battery origins was a little dodgey because Tesla makes similar batteries to the ones they also buy from vendors. Panasonic comes out as the main player in this most recent run of MY LR and M3 cars, even though we see pictures of batteries with 'Tesla' on them. I believe Panasonic also made most of the batteries for the 2022 MY LR and MYP and M3 LR. Not that Tesla hasn't also made batteries. I think the percentage is low compared to Panasonic batteries.
Other differences are the pack housing for 4680 batteries is at least partly structural. Another cost saving strategy? 2170 batteries are proven performers and are at a middle place between cost and performance. The 300,000 mile claim on the 2170/4680 still hasn't been proven to my knowledge. All they legally owe is 8 years or 100,000 miles. I'm not doubting the claim, but I don't think it has been proven widespread in real life situations.
The good news is a replacement pack can probably be had for under 10K if after over 10 years one still wants to drive the car. That market will be opening up as EVs gain some age IMO.