Regardless of diagnosis, the fact that you had many symptoms improve after removing gluten indicates you can't tolerate it.
Make sure you are not getting any gluten from processed foods and are preventing cross-contamination. If you haven't read this thread - it contains valuable information regarding getting the gluten out:
Additionally, have you had any nutrient testing to see if you are deficient in any vitamins or minerals?
Finally, it can take time. That you have had many symptoms improve is encouraging...it just may take longer to overcome the fatigue.
Hang in there