hi david,
i am based in india,still a developing country but i am shocked to hear this sort of instance to happen to you in a developed country like australia.
what angela and roaslie said is absolutely correct.
though i am not a doc and just a parent of a cah boy,i am 100% sure you are a girl and have a adrenal defficieny called CAH.if you were treated correctly right from your birth this problem of ur feeling more of male wouldnt have happened.i dont know ur age but you'd require another vaginoplasty under the supervision of a good endocrinologist which is normall done in the later teens.
i can understand what you are going through,but all can become normal ,just get in touch with a good endocrinologist.
c.k.l