Vanilla water bottle can be filled from any #minecraft:water. This creates many problems. It is also not a fluid handler.

Given it is obtainable earlier or as early as a ceramic jug, it may be worthwhile to just disable the recipe for it and prevent it's use as a drinking container. Would be less effort than fully implementing it as a fluid container, and won't outclass the ceramic jug.