One of the reasons for upgrading to a T6 is to have a less stressful & more relaxing experience with a bit more luxury so I'm afraid the foot-pump for water is a no no. Anyway, to get back to the water question. We do a lot of wild camping & rarely go to campsites so our priority is be able to store as much fresh water as possible whilst keeping the interior as spacious as possible. As for waste water - I much prefer having a decent sized tank that I can empty every few days rather than a hole and a bowl. I've already experienced that when I had a bay 20 yrs ago. I wasn't keen then & am not so now. I'm now looking at this option. Gas-it underslung tank in front of spare wheel, Propex 1600 gas heater outside under the driver's seat, CAK 204 & 205 freshwater tank giving a 48L capacity (on a par with the 50L in my t25). For waste I'm now looking at this 27L tank by Reimo which fits under the window on the drivers side.