I agree with Doodledog, I don’t think all pupils/students should be made to study maths until they are 18. I was at Grammar school in the late 50s, and a bit of a dreamer. I studied all the basic subjects including maths(geometry, algebra, trigonometry etc), Latin, French etc. I was in the 3rd division maths (the no hopers), and the maths teacher had very little interest in us. I was told by headmistress (mid GCE exams) that I needn’t expect to pass any exams. I passed 6 out of 8, and then my parents removed me. I have a BA from London University, and subsequently 2 postgraduate MAs. I have lectured in colleges, and won residencies in other countries. I was also awarded a Winston Churchill Travel Scholarship. I wonder what would happen today to ‘my headmistress’. Maybe she would have been sacked?! She never apologised.
So I do not think everyone should be made to study maths until 18 (just because it’s Rishis favourite subject). But I do believe that everyone should be able to do the full curriculum until O grades or 16 years of age, everything you learn comes in useful along the way.