You sound like you know the difference, but It is important for us to explicitly note that WACs and WAVES were different from the WASPS.
WACs and WAVES were branches of the military, where WASPS were not. Thw WASP program was created to hire civilian women and train them to fly military planes from the manufacturer factories to various points around the continental USA where they were handed over to military personnel for use.
They were not military, and never were military.
There was no military branch called “Airforce” during WWII. It was the Army Air Corps. WASPS were not part of the Army.
Also, some military pilots took their basic flight training from civilian flight instructors at civilian air fields (GHW Bush, for one). This was a similar program to release more military pilots to combat roles. There was a push in the 80’s, IIRC, to recognize these civilian instructors as vets, as well. I don’t think it passed.