Parodia - magnifica or warasii?

Here's one that I'm rather happy with - It's a clump of plants that I've had in the collection for a couple of years, however this is the first summer that I have seen them blooming:



Obviously it's a Parodia, aka Notocactus.

Beyond that, I run into difficulties. There's two species - P. magnifica and P. warasii - that both look like these plants. That said, I can't really tell either species apart. They seem to have the same shape, spination, flower...

To complicate the matter, there's at least two different plants sold in Australia as P. magnifica - the example shown above which pups from about the size of a large orange and has bristle-like spines. Then there's a smaller form which has much finer spines and seems to pup from golfball size. Are these plants merely clones of different cultivars of the same species? Or are two different species being sold under the same name?

Cool looking plant but I'm at a loss with any further ID, sorry.

Hm, I think it must be a P. magnifica!