Kimmio's definitions are indeed the WHO definitions. However within academic circles the social model of disability is usually nuanced. That is, it is absolutely acknowledged that people with disabilities live with forms of oppression, barriers, and discrimination described by the social model. No argument. However it is further acknowledged that disabilities (you will note the move to the plural) are complex and diverse and cannot be universalized to a single experience articulated by a particular group. Multiple intersection exists that account for a person's experience of oppression and these can include the other factors (to name only a few) that I have listed above. Further, it is understood that the medical/social model dichotomy is often a starting point, but in academic circles that dichotomy is being explored as a spectrum where multiple other "models" inform a person's experience of disability. In other words Kimmio is saying disability is black vs. white, while I am saying that the experience of disabilities falls along this spectrum of grey.
Kimmio's preferred model favours people who are, comparatively speaking, people with disabilities who "look" like her, that is cognitively intact, verbal, literate, educated, among other qualities. While she cannot see it, her preferred model excludes, in many ways, the experiences of people who rely on their caregivers to interpret their experiences - people like my son who are profoundly intellectually and physically disabled, as well as non-verbal. She says she is avoiding that conversation to spare me. Realistically it is because her argument will rapidly disintegrate if she opens her discussion up to a broader understanding of disabilities.