Except I don't buy this framing that the two are in conflict. The more general awareness there is in the general population around neurodiversity, simultaneously the less shame there is about medicating and also, the greater willingness there is to accommodate each person's individual diversity.
Accomodations initially rolled out for diagnosed neurodiverse people: Like being able to control the lighting in your workspace, or being issued noise cancelling headphones no questions asked, also benefit neurotypical people who are also on the further end of the bell curve for things like that.
This is already the case. Maladaptation is a fundamental diagnostic criteria of essentially every neuropsychiatric condition. There is no reason to treat something if it's not causing you harm.
However, I do strongly agree with you that setting a boundary to "normal" and therefore implying these states to be abnormal and something that needs to be fixed is not helpful. We should be able to label a wide spectrum of neurological wiring quirks without nudging people towards changing them, unless it actually negatively impacts their ability to live a fulfilling life.