Honestly, even though I'm generally happy with my MY, with this many updates, including the door glass and self-dimming side mirrors, I'm leaning on trading my '20 MY in once all of this is available in the US, and the upgraded battery pack is available.
I figure the resale value hit will come regardless based on all these updates. I know I already lost $3K when the price was dropped 3 weeks after I took delivery. I don't regret purchasing when I did, but the question will come down to whether I would have made out better with a lease vs. purchase when the time come to either trade or sell.