I have a 1986 C22 which has a removable water bottle for fresh water. It's limited capacity and location makes for a bad combination. Has anyone ever changed the tank to increase capacity or located a deck fill fitting to make filling the tank easier. How about placing a larger tank in another location that would not affect boat performance. I saw some soft bladder tanks that might fit in a different location. Any advice would be appreciated.