Yes, that could be it too, but as I mention, once the ID is lost it is really hard to get it back, too many similar looking hybrids. E. oxygona tends to have slightly different flowers than those shown in the OP - more pointy petals, but the differences are minute - I have both, but my oxygona has longer spines, so for me when I see an almost spineless plant I do not immediately think of E. oxygona.
