What if, when replacing an upgrade, you didn't immediately lose the old upgrade, only losing it when the new upgrade is complete. This would make switching and having to cancel the upgrade less punishing.