Elon,
Leave the new pricing in place and offer lifetime Supercharging for $7,500.
This way the early adopter will feel they saved $2500. This should also please the P3D-, not just the P3D+.
The late adopter will be unlikely to pay $7,500 for this service. And if they do Tesla Shareholders...