I would also keep the matches, simply because they weigh very little and they make starting a fire very simple task as most folks know how to operate them without any specific skills....can be waterproofed by dipping the heads of the matches in wax. A section of butyl bicycle inner tube can then be wrapped around the match box....

A small air tight metal tin such as a used boot polish tin to keep cotton balls soaked in Coleman White gas, is also useful as a last ditch fire making tinder. A packet of Esbit Tabs also make for a useful fire starters in cold and wet conditions.

I also like to include a miniature AAA powered Laser with a lithium battery for signaling as signal mirrors really only work during sunny daylight hours.... I would also replace the AAA maglite with a suitable replacement such as the Tank007 TK-360

The CR123 cell has a much higher capacity and this flashlight is very good value for money. The focus optics head can be removed and used as a wide area light and for SOS signaling.