I'd say you're on the right track right now.
To echo the previous comments, keep eating gluten on a daily basis until your endoscopy. They'll take a look around your duodenum. Make sure they plan to take biopsies, as they may or may not see notable changes visually, but the biopsies are where they can look closely for the kind of damage that is characteristic...