Definitely in the genus. The way you know it's not an intergeneric Echeveria hybrid is by the shape of the flowers. Echeveria flowers are tubular and their hybrids tend to retain this feature, even if in a reduced way (sort of cup-like sometimes instead of actually tubular).
I think you nailed it, Baja. I put it in the plant database; if it's wrong, someone will tell me. Though tiny, the flowers are so complex! You just have to look closely.