Welcome to FT.
you are correct: YBM for the SWU but before ticketing check the Z class availability.
Usually, when using SWU, I'm on the phone with my travel acency and the DL call center, as soon the itinerary is ticked the call center reissue the upgrade.