Sounds like a good plan. I have just 4 basics in my journey: eat healthy, drink healthy, exercise & visit this site for support/encouragement. I use a calendar & colored markers...blue=water, green=food, red=exercise, purple=support. I can look at my calendar & know in a glance how I'm doing.
You mentioned non-water drinks. I don't know what drink you'd reach for before you decided it was time for a change. For me, it was soda. No lie, I'd drink up to 8-10+/day! Not per week PER DAY! UGH! To ween myself off of soda I got some fruit flavored sparkling water. It gave me flavor & the bubbles I wanted. At most I have only 1-2 a day. Big change & I don't feel deprived. I drink the store brand from Wal-Mart & enjoy them thoroughly. I suggest white grape/black cherry, strawberry is a fun change too!
Keep us posted on how it goes! Good luck!!!