Hi Jim,
I would say that you are quite right, they are both Mammillaria bocasana, and I think they both justify to be described as f. roseiflora. The normal bocasana has cream flowers, and I have seen the pink ones vary a bit in colour depth and some seem to have a darker stripe in the centre of the petals than others, but they are all the same.
_________________
Chris43, moderator