Since the bug was patched, I followed the suggestions and started farming water - and indeed I have more water than I can sell. However curiosity got the best of and I saved my saved games to a USB drive, then removed and re-installed Fallout 4 (having disconnected from the internet). I was able to perform the bugs again and store up on ammo and t60 power suits. After I did that for a couple rounds (days) I exited the game and enabled internet connectivity. The game updated and I had no issues with my saves.
Cheers