Even though I am an EXP, I would say that OP should have been allowed to keep his upgrades. Once the upgrades have been cleared, ther should be no packing order.
Overal incompetent and unprofessional behavior by the GA as well.