No, you are right. The M. vetula is ssp. gracilis, and is a clone of this, often called Arizona Snowcap.
I think you're good with Un Pico.
And the M. elongata, the spine length varies considerably, this sort of form is sometimes called elongata ssp. echinaria.