I think my final decision about upgrading comes down to the fact that they chose more power over more range for the DE.
I'm OK with paying more for the upgrade if it comes earlier and if it doesn't detract from what I want in the car. Even if there was no change, I might have considered it.
As for the power upgrade, I'm fine with the base motors. Upgrading them would be interesting, but it wouldn't be a factor in the decision.
370 miles is a pretty good range, even in today's world, but far short of the 437 I have on order. The 67 mile loss of range is too much for me to consider it "as good or better" than what I ordered.
If I had wanted the larger wheels and I had already accepted the loss of range that came with them (as I have accepted the minor loss for the 3rd row), then I would probably have jumped on the offer.
I also think there is probably a good reason that they went with +power and not with +range. Upgraded motors probably take little, if any, extra room to add. They probably already had the space planned for a potential performance model (or sapphire?), so putting them in now to create the DE was a simple engineering/manufacturing tweak. But, the space for the battery pack was probably planned too finely to just find some space for more batteries at this stage. The space planning was pretty aggressive. The only way I could see this having been done is that they could have used the 3rd row footwell for added batteries, but then the DE would only come in a 5 seat config, and that wouldn't sit well with their "all the options and goodies" DE philosophy.