My understanding from your post is that since you were diagnosed with NCCAH in 2000 that you have moved. Does that mean you are seeing different doctors now than the one who diagnosed CAH?

Does the new doctor know that you were given a CAH diagnosis or is he just thinking that you have PCOS? Some of the symptoms of both these conditions do overlap (eg. high testosterone, DHEA-s), however there are other biochemical/hormonal levels which are more specific to CAH.

When the doctor orders tests again in the next month, make sure he at least tests your baseline level of 17-OHP (17 - alpha hydroxyprogesterone). This will hopefully show him that your previous diagnosis in 2000 was legit. If he is unconvinced that you have NCCAH the best way to really look at your 17-ohp (and cortisol) level is by having an ACTH stimulation test. Maybe you could convince him to order one for you, if he is sceptical 

BUT a word of warning. If you have an ACTH stimulation test, stop any corticosteroids medications that you are on for at least a few days before the blood test is done in order to get an accurate reading. (That includes any steroid creams and don’t have any steroid injections into joints for a least a month before the 17-ohp or ACTH test) as these can skew the results.

Why do you think you will need a hysterectomy?