When you upgrade at the airport (AUP), what class of service are you booked into? I'm thinking about upgrading a work purchased flight (I can't upgrade myself through BA's site), but I'm willing to pay the AUP price. However, if I don't get extra AS miles, it might be worth trying to call my company's agents to see if there are any upgrade offers.
I'm thinking about booking into CW.