I will disagree here. I think golf comes first ... the variety of golf shots that are possible to play.
Yes, there are way too many modern courses where everything is overdesigned to be "fair" for the good player. But on the other hand, there are a lot of courses good players love partly BECAUSE the green targets are too shallow for B players to hold. Such good players should be condemned to always playing said holes in a 40-MPH wind.
Instead of throwing the kitchen sink at golfers, it would be nice if some architects concentrated more on bringing back some of the golf shots that John Ball could play 80 years ago, but which few of us ever try today.