So my reservation is with non-staus pax. Outbound CPU waitlisted on a short flight (SAN-LAX) and PlusPoints came through for the outbound international leg. But for the return we have an instrument upgrade waitlisted for the international leg and CPU waitlisted for the short flight (SFO-SAN).

I have instructed my friend not to checkin online but wait until we get to the airport and check in together. This is because a few years ago when traveling with another friend IRROPS occurred and they lost the instrument upgrade as the reservation was split due to the waitlist for the CPUs.

My main concern is the upgrade request (and baggage allowance) for the return. Is the best advice to cancel the automatic CPU waitlist on the outbound before T-24? Same for the return if the upgrade has not happened before T-24 for the return date?

Edit: outbound donestic short leg is a B fare and I am 1K so maps into PN, not PZ. Return domestic leg is a W fare.