One option would have been to get moved back to row 21, checked in, then call and request the upgrade again. If the X inventory was still there the OP could have dealt with the UG at the gate and had the BP to get past security.