I personally despise most of the dining options in Waldorf. But we have found that Napoli Pizzaria on 301 makes pretty good stuff. I do enjoy their gyro's. The meat is well seasoned and incredibly tender. Don't expect great service though. It's friendly, but not great.
Your'e spot on about the service at Napoli's. To me, they seem really unorganized. The cashiers do too much.. takes orders (including by phone), makes drinks, serves food, etc. People stand in line forever it seems sometimes. They need to change the set up.