I would also suggest going 100% gluten free regardless of your test results. I know that can be hard without a clear diagnosis, but for me it has made all the difference in the world to be totally strict about the diet all the time. I had been gluten-light for years and had many of the problems you mention, but my celiac tests were negative after a miserable gluten challenge. However, they only took four samples and did not take any from the duodenal bulb or do lymphocyte counts, which were the two things that my daughter's biopsy-confirmed celiac diagnosis was based on (if they'd tested her the same way they tested me, she would have gotten false negative results). I really don't know whether I have celiac with patchy damage that the biopsy missed, or non-celiac gluten intolerance. But either way, being gluten free has made such a tremendous difference that there's no way I'd go back! Going from a "gluten light" diet to a totally gluten-free diet had a much bigger effect on me than going from eating gluten daily to only eating it once or twice a week. Getting rid of that last little bit had a disproportionate effect!
I hope you get clear test results so that your decision is easy.