Your #2 is oddly one of my fav things I've implemented recently. I use 2 identical bottles with straws that I fill in the morning and just by them being there (I drink them whenever I'm listening in Zoom calls... looks a bit awkward, but I'm over it) I'll finish 2 full bottles a day without even noticing it. My whole life I've drank literally 0 water up until recently!

Another one that worked well for me is putting laundry baskets in each corner of my living space and swapping out my closed clothing drawers with open hanging shelves (from Ikea, <$20) and small open boxes (<$5) on the ground for underwear, socks, etc.

It's experimenting with these small things to put on autopilot that have helped me a lot too!