I don't think I've got much of significance to add, partly because I'm not sure where you're heading with this? (It feels a bit stamp-collector-y to me).

But I'll note that to the extent I think of myself as disabled, I'm even over further into the social model than you are: it's not impairment + how it interacts with society but just plain difference + how it interacts with society. I suspect Deaf people feel the same way.

(Yeah, I have an "impairment": I can't function well in capitalist/consumerist/individualist/zero-sum-thinking society. But I don't actually think that's my problem, I think society should be different, and heaps of people other than myself would also function better in a society that accomodated me.)