If the upgrade still hasn't cleared by check-in, the Aeroplan number needs to stay on. People have had mixed experiences getting the frequent flyer program changed at the gate after the upgrade is confirmed. Ideally, it shouldn't be an issue if the upgrade is provided by a sponsor, but I'm not sure if the GA has the ability to see that.