You Require those 3 mods and remember to load this one last in your load order.
Survival Options by Jekod
Give Me That Bottle by Zzyxzz
Everyone's Best friend by Valdacil

The Give me that Bottle Patch is already in it no need to install it.

I'm not sure if the patch is perfect but I can fill my bottles and dogmeat is happy.
So if you can find a bug, feel free to point it out but I didn't see any on my part.