Joe--
I don't know if this is what you are looking for, but I have found two
survey texts that cover at least parts of that time period.  Each has
shortcomings, but they are good for undergraduate courses.

Rebecca Edwards, "New Spirits"
H.W. Brands, "The Reckless Decade"

Best,

Tracy Wuster