I think I understand his issue because I have the same issue.
I have two UDP and one basic line, all with an upgrade available.
I would like to take advantage of the BOGO with the M8 and not lose the UDPs.
Is there a way to use the upgrade on the basic line to get one M8, then remove that...