Egypt visa on arrival vs e-visa: which is easier when you're on a guided tour?

My husband and I are doing a guided tour of Egypt in November and I’m confused about the visa situation. I’ve read you can get a visa on arrival at Cairo airport for $25 OR do an e-visa online before you go.

Which did you do? The e-visa seems easier (no waiting in line after a long flight) but some people say the website is glitchy. Also, does the tour operator usually give you guidance on this or do they just assume you’ll figure it out? We’re American passport holders if that matters.