After all that, while at the dealership, I had a really good look at the option packages for the Corsair, and it turns out that on the standard, some things are no longer available, or they're now available only in a package we don't want, or in one case, the necessary package isn't available if you get another package.
That, for example, left me needing to choose between a leather-wrapped steering wheel (available only in the "premium" package, with other options we don't care for) or a *heated* steering wheel (available in the elements package, which can't be purchased with the premium package, and vice versa). The leather wrapped steering wheel in 2020 was standard on all trim levels, and did not interfere in any way with the elements package, either at purchase time, or in actual use.
So ... we ordered a Corsair Reserve instead, packaged up so that it as closely matches as possible (modulo the decontented items like the temperature displays in the center console) the Corsair we so loved, *plus* I'll get the fog lights I was intending to add myself. We also had the dealership order the engine cover and hardware from the 2020. I'm not sure if they'll install it for us or just hand it over with the keys, but I'll certainly be glad to install it myself if necessary.
We're expecting to pick up the 2010 Edge tomorrow (from a different dealer). The Ford/Lincoln dealer has ordered necessary parts to address a couple of outstanding recalls for it, and they'll let me know when those are available.