Neither. I think at some point you just run into the "lots of shit has been done already" wall. That said there have been plenty of bands writing killer riffs after the period you outlined.
Plus, I think we just hear so many more bands now than we used to that it makes everything seem more generic. There were a million mediocre bands knocking off the bands in your post back in the day, we just never actually heard them.