Looks like your Big 4 are under control--now work on the rest! Can't advise more without a complete list. As it is, your base is only about 2 lbs. more than mine. That's another liter of water, though! The more you can reduce base weight, the more water you can carry!
_________________________
May your trails be crooked, winding, lonesome, dangerous, leading to the most amazing view--E. Abbey