Hi Mandee,
TMJ just means temporomandibular joint. So, anything that involves the joint in anyway can be called TMJ, or actually, TMJD or TMD (D is for dysfunction). You do sound like you have the basic symptoms with the clicking and occasional pain. The locking is not good and really none of this should be left as it is.
Your bite balance, or how your teeth come together evenly, is very important for stability of just about your whole head and body, believe it or not. It's actually quite amazing. We don't have to have straight teeth but we do need to have that "balance."
If I were you, I would see a TMJ dentist. The solution may be quite simple. Braces are a possibility but if you are thinking of getting them, I would recommend that you see someone who practices Functional Joint Orthotics. What they will do is make a splint to get the bite balanced first. This usually takes less than 6 months. After that, braces (or whatever the next step would have been decided on between you and the doc).
I pray that you find the help you need. I have found in my case (and many others) that the most difficult part of TMJ can be to find a good TMJ specialist, so that is my hope and prayer for you.
God bless...
Carol