I think you're on the right track with hard-mounted tank and a filtration. Carrying those 20L containers around gets old fast. Here is mine. It is a single 60L tank with hard-mounted discharge pump, a separate fill pump which can be dropped into a bucket or stream/river, and a separate filter...