ID request

I am not sure of this plant's ID. It seems it could be like a few alternatives.

It's sometimes difficult to easily identify some of these hook spined plants from Baja. The simplest thing to say is that it is probably M. dioica, as its a very variable species. But I'd also think about M. hutchisoniana as well, as the flower looks a bit more like that species to my mind. I need to spend some time on the books.

Thank you. It is a nice little plant, just coming into flower in collection 4 degrees south of the equator.