Just in case it is helpful to anyone else, after thinking about the issues a bit, I decided to set all my items (it's not a huge portfolio there anyway) to draft - they're not for sale but they're not deleted either.
The problem is that if I price the standard license to include up to 500 items for resale (T shirts, prints, etc) it makes it crazy expensive for someone buying it for non-resale purposes. I could do that, but it (a) probably won't sell at the new price and (b) makes me look like a complete idiot, IMO.
The extended license is unlimited items - again, an unfortunate choice to have no limit versus 1K or 5K because if you price it for truly unlimited it'll be super expensive.
The other thing to note is that CM has made both licenses one project only - so in theory, a buyer who wants to use an item in a second project has to buy a second license. As they have no way to police this, I think it's unlikely to be observed - it's different from most RF licenses at other agencies.
Fonts got their own deal and are now licensed the way they are almost everywhere else - one user per license purchase but any number of projects including words on T shirts or other items for sale.
I have put several of the PSDs I sold on CM onto my own site so I do have a way to license them (although the traffic is better on CM so I'd rather sell there if they'd change their license terms...)