The blooms emerge along the growths rather than sending out a long spike. And, the "leaves" and growth habit are different. This plant is more succulent in appearance.
I would say you are on the right path w/the Cleisostoma. Any chance the person you got it from can help w/the ID?