I didn't contradict myself, you didn't understood what I was writing. Otherwise, please provide where I contradicted myself.
You tried to substantiate your claim that the question whether or not something is a disability depends on (social) context with mentioning that the "flaw" that Michael Phelps has supposedly aided him in being a better swimmer.
My point is that, for the definition whether or not something is categorized as a disability, it doesn't matter whether it is not disabling in certain contexts for certain individuals. Or whether you can imagine a society where it's not disabling.
"Intrinsic" and "non-intrinsic" disabilities, this differentiation does not make sense.