It sounds like you had a great time in Baja. It is one place that is on my list of places to visit, but not this year!
I don't immediately recognise the plant, but suspect that you could be right with M. phitauiana (verhaertiana) thoiugh my plants in culuvation of this species grow rather slimmer. But that could just be the difference in light levels! It's a shame it wasn't in flower, as that could have been the clincher.