Sure, some people who paid for the 60kWh packs will be annoyed paying "extra" for it but is that really such a concern that you have to start dicking about with what amounts to basically battery DRM?
[EDIT] As someone mentioned below, if 40kWh models have already shipped then replacing them will be a PITA, but if they haven't, win-win?