I still feel that they are separate but often happen concurrently, but you can still find extroverts with AS, just not that common. In social and professional situations it is often the missed nonvocal signals and misinterpretation of what is said by someone with AS that gives other people the idea that all is not quite right.
It’s good to learn about yourself, whether you have a “disorder” or not but I also think it’s good not to hang too much on it.
Attempting to keep up a mask can be very tiring, and not always successful for me, I prefer the option of playing up strengths and hiding weaker traits, as you are doing at the moment.
I’m not sure if being a contractor is limiting in your profession, chance of promotion or career development for example, is this a problem for you?