Disagree. I think tribal warfare and fighting predators are things we are built for and desire to do on a base level, hence why we have (poor) substitutes in team sports, modern hunting, and the action movie. The lack of these things is a loss not a gain.
So would I but I think it's important to avoid just using what our current selves want/would do in discussions on what would make happy humans. We're products of our environment. Modern humans would be fucked (and unhappy) if magically transported back 20 000 years myself included, as I believe humans 20 000 years ago would be if transported to now. What's more is that there's an issue of extrapolating what is best for a society as a whole from the wants of the individual even without the differing time period. I or any other person may want a billion dollars but if everyone was suddenly given a billion dollars that wouldn't be a net gain, it'd be an economic catastrophe.
I'm not even 100% on this theory and it's one of my least researched so there's plenty of room for someone to come and slay me with data but I think the discussion definitely needs to come from a place of "pre-agricultural humans living their pre-agricultural life while ignorant of modern life" compared to "modern humans living their modern lives", rather than one of "well why don't you just go live in a forrest if you like it so much!?"
Everyone dies. Savage humans at least had the benefit of a lesser ability to ponder and comprehend the permanence and inevitability of ceasing to exist.