Depending on your budget, buy a pair of zip-off/convertible pants. Saves you a few ounces in carrying shorts as well as pants.

Maybe replace tea candles (DR seems to have problems with them melting in heat, though if you're in Canada, I doubt you will). Another thought would be add a relighting "trick" candle to the mix.

Otherwise, looks good! I might have to go through mine and parse it down a bit.