Does the 2021 feature something that you really want or need?
If not, wait for a bigger change.
I understand justifying it, but I don't see any reason to switch cars for iterative updates.
-FSD (only get Autopilot)
+Dual Motor AWD instead of RWD
+double pane glass
+heated side mirrors
+2 additional years of warranty
Would you pay $5,000 for the above?