I too believe its Mammilaria nejapensis. Wildbloomers didn't list her references where it states we are all wrong so I think I'll stick with M. nejapensis (sorry Wildbloomers). I just took a couple photos of mine and guess what, a dichotomous split is about to happen.
I love it when that happens.