Tiffany,
After a year on the gluten free diet with my husband getting sicker & sicker his dr (thankfully) retired so the partner took over my husbands case. It was the partner who correctly diagnosed him. We later found out the original tests came back negative but the dr just diagnosed him anyway, wrote in his charts that my husband was "cheating" on the diet, etc. We were so angry! I really hope this info helps even though CVID isn't a great thing to have your description certainly seems to fit. Michael (husband) gets an IV every other week if immunoglobulen. Most people get it every 3-4 weeks but the delay caused him to be worse. The really bad news is the cost of immunoglobulen - $20,000 a bottle- but insurance does pay for it.
Keep me posted.
Jo