you're overriding the water bottle mechanics, so you should think about making it work with other tanks that can hold water through the Forge tank API and make those work as well
maybe add a clean-water fluid so you have control of what tank has vanilla water and which has purified water, then add that to oreDict as water for other recipes (in case it's stored in refined storage or a fluid crafter etc)