It’s a good set, but you should add some sort of basic signaling equipment in there, like a signal mirror. Cheap, hardy, very light, effective at range, and extremely easy to use. You might say, yeah, but that’s doubling up with the sighting compass since it has a mirror, but trust me, it’s not really an effective replacement.
Whenever I hike, I just try to cobble an idea of the route using any crappy maps from the parks website, taking a photo of the map at the park’s entrance, and snips of my route from the topo maps available on USGS.
I don’t use physical maps as I don’t have a printer. As for water, being in Arizona, I just assume what’s on my back is all there is.
I also keep a blaze orange vest in my hiking backpack. Useful if you see shell casings or hear gunshots - and can also be a flag if you get trapped or stuck.