Survival, and the gear needed may be independent of needing or wanting to be found. The worst case scenario is, of course, when you desperately don't want to be found and someone is actively looking for you. Then that GPS cell phone could become useless or worse. A hand held GPS not tied to your registered cell phone could be a good idea.
Having given this some thought, I am preparing 3 separate survival packs -- a fanny pack, a day pack and a full back pack. The fanny pack is aimed more at urban/suburban survival. You can imagine it will contain items far different from the items that would be found in my woodlands day pack. The full pack will be a combination of both and will have a tent and sleeping bag ready to go. If all hell breaks loose, I will be grabbing all three.
BTW, if you haven't discovered Sanyo's Eneloop rechargeable batteries yet, you should look for them and have some on hand. They hold most of a full charge for over a year and perform just as well in cold temps as hot. They have no "memory", can be short charged or fully recharged 1000 times. That's what I keep in my hand-held GPS and Fenix flashlights as well as my camera gear.
I don't smoke, but I do think that I will store pure grain alcohol and not denatured alcohol in my back pack for use with the alcohol stove and for medicinal purposes. Probably 2 or 3 quarts should be enough for short term survival needs.