I think you'll be fine with 16 gallons. I mean, you can always carry a 5 gallon jerry can and that will give you basically the same capacity you had before. Plus, it's not like you will be going on cross country road trips in it all the time, so...
Yeah, bummer about the weather, it was soooo nice last weekend. We should get some work done and drink a lot. Maybe Sunday morning it will be clear enough to take the Troop out back with some toys and spray a little lead...
Bart