Yes, I don't believe in the needs based approach - its led to all the issues we have, as people always want more and become entitled to the majority of work of others. We should focus on a pay in, get benefits for doing so, including support when struggling based on what you've paid in.
For those who have never paid in, they can't really expect anything.
This has nothing to do with needs, but is core fairness based on what you've done, nobody owes you a living. Those who want to contribute and support like friends and family are free to do so, and that's the model I prefer - make support of others voluntary, don't try and fix all the differences between people.
As I say, not sure why you are correlating this to disability - whatever people do, the more they pay in tax, its only fait they should get access to improved services and those who decide to take a path of doing very little get little back.
It is completely unfair for the OP to work all her life and the person who does SFA to get a similar set of retirement benefits - she should be happy and the other should be regretting it, and maybe shouldn't ever be able to retire at all.