Which Ferocactus?

[Dixie Chicken]

Here is another of my uncertain IDs...I waited for a flower to try to narrow the choices down somewhat and even that didn't create a positive lock. It's in a 6.5" pot for reference. I've had it for just over a year, and it came labelled as "Ferocactus wizlizenii", but I'm not sure it really fits. Can anyone weigh in with some suggestions? Many thanks for the assistance!

1.

2.

3.

4.

[majcka]

Hamatocactus sinuatus (Ferocactus hamatacanthus subs. sinuatus)

[Dixie Chicken]

Many thanks! Looks like a good match.