We've dealt with the labels by others who claimed to be professionals in the past with my son and like you I just had that gut instinct that they weren't hitting the mark. They were trying to fit him into a check the box so they could feel like they were giving us answers but they really didn't know what to make of him.
Although my son does have currencies that we can use to work with his behavior, they aren't what the normal school system tends to use or think work.
We did as you are doing in Spring, found a testing place that was knowledgeable about the gifted child and I highly recommend the GDC in Denver smile
Best of luck on your journey!