Sean,
Not sure diversity necessarily relates to "overdone."
I recognized long ago that perhaps my designs weren't as diverse strategically as they might be, perhaps because I am a visual type person. Humans are so much a creature of habit, that it was easy to put in a good looking target bunker, for example. Or, just rely on the standby's because you know they work.
My solution, as it were, was to sort of pre-identify some strategic concepts I like (and some I don't favor, but which work) as part of my design process. This is not unlike CBM's pre-thinking his "Ideal Course." You can see some of it in the second (?) Paul Daley book. Then, I search for the landforms to fit those strategies in. While most archies have done that, it didn't seem like a very popular notion around here, as many were concerned that those sorts of things are "forced on the land". Doesn't have to be that way!
BTW, in general, Thomas' book was always my favorite, perhaps in part, because he did the same thing. Things like preferring the back of greens to be "fairgreen" or the tee sometimes merely being an extension of the fw are all things I have adopted into my designs. Just not every time, because I didn't find the proper location/situation for them all.....