I was given my diagnosis the first time I went in and saw my psychiatrist. He pretty much exclusively diagnoses and doesn't do much therapy, if any...so I can't really help you there.

It took longer than that to get my other diagnoses when I was first working with a psychologist in therapy, like it seems you are describing.

Just remember though that the diagnosis isn't what's important. The important thing is you getting the right treatment.