I'm not saying not to carry the proper equipment, but 2 tubes is definitely overpacking. Count back to how many times you had 2 flats in 1 ride and you were alone and couldn't find any help(road).
Part of not getting flats isn't just getting good tires, it's avoiding debris. When I first started riding, I rode over all sorts of things that caused flats, later, after I gained more confidence, I rode more to the center of the lane and away from debris. I do not flat as often anymore.
2 water bottles is subjective, but I usually just drink heavy before the ride and then drink 1 water bottle while refilling it.