I like both choices. Mozart maybe for old music, total genius.
As for modern, while I love queen's music totally and completely (my first ever Cd was queen's greatest hits) a lot of their appeal is showmanship and not outright musicianship.
So I do agree, but would also throw in Hendrix, Tom Petty, Sam Cooke,
Neil Young... Vastly different but exceptional in their own way. On any given day I may say one or another of that list depending on my mood or what I've been listening to that week, so all contenders to me.