I'd be adjusting my carry method. I personally like to keep one of my RAT knives...Izula, HEST, or RC-4S...inverted on the shoulder strap of my pack for easy access.
I think you definitely need to add a firesteel, a strike-force & tinder cube, a mag block, a good match safe...some sort of back up fire starting system at least this time of year, but pref any time of year.
I think you need to address the light issue. Headlamps are great. It it is a space or weight issue Petzl makes a small light weight version called an e+lite that is light weight and fits in a small protective capsule that tucks away nicely.