I agree with you about good music being created everyday. I was born in 63 and could not pick a single era, as too much great music would be eliminated. Should I lose the Beatles because I choose The Smiths? Should Gotye be discarded for XTC? Where do you put Radiohead?
I disagree about being able to pick just specific songs. When I used to buy albums, cd's, etc, I always found gems that I would have never heard if they weren't included in the compilation, because the "radio industry machine" didn't find them worthy of air time. They were the kind of songs you had to hear a couple times and they would grow on you. But some are my favorites now. It's just like photography today. Because everything is digital, everyone just deletes those pictures that aren't exactly what you want. In the days of film, you had it developed and got what you shot. Sometimes they were garbage, and sometimes you caught something you hadn't expected that was precious.
You talk about them stepping up their game, but all you are going to eventually get is the songs that some test group has sampled. They will say, "Yes, that will sell", and that is what will get released. If you don't think so start investigating how many movies are shot with multiple endings and then released based on which ending a test group says appeals to them better. "What if the test group isn't at all representative of what you find appealing? If you appreciate a band, then listen to the band and give everything they put out a real chance. You may be surprised.