I found a key for Echinopsis! Page 249
https://books.google.co.uk/boo...
I 'think' I got to #18b but 18a (Echinopsis obrepanda) fits better even though it mentions 'spines curved', the small tufts could be curved on mine? I found a photo which looks like it.
http://www.massey.ac.nz/~sglas...
http://www.massey.ac.nz/~sglas...
I tried to key Myriam's but can't do it.