Inflatable mattresses are the way to go. As someone has said, look at the POE AC Elite (cheapest, lightest, jury out on long term quality), Neoair (most expensive, lightest), Big Agnes Insulated AirCore (cheaper, heavier, but popular).
I like the Montbell inflatable pillow (if you need one, I don't like stuff sack filled with clothes or my pack as a pillow). I found it the most comfortable.
For 4 people, not that you want to buy a new tent, but you might want to take a look at the offerings by Tarptent.
And think of less bulk as much as less weight (hence inflatable). The less stuff you have, the better because you aren't digging around for things, less to keep track of.
Use platypus water bottles for hauling around water. Fill partially, squeeze air out, fold in half if need be. I usually also bring a gatorade bottle for convenience.
Trash compactor bags for keeping things dry, instead of individual stuff sacks and dry sacks.
Did you sleep with your bag as a quilt over you, stick leg out to keep cool? Bags are expensive and a pain to try to find the perfect one, so take your time.
Ignore if you already know all this. Happy trails.
What about bear spray, storm whistle and knife, instead of pistol, unless you're a killer shot?