I think Ferocactus wislizeni, but F. peninsulae is a possibility, just hard to know if the latter would have been available in the trade here 20 years ago, since they are not really that common these days to begin with, so mostly likely F. wislizeni or a subsp. there-of.
