as far as I know, until the upgrade is clear, you need the Aeroplan number attached to the booking. hence, I think the challenge is that if your upgrade clear at the gate, the GA might not willing to change the FF number for you.