Yes, there is no difference in the meanings of those sayings. One can also say "Until I get into the swing of drinking 6 glasses of water a day...". You learn a lot of these phrases talking to native speakers and it makes your English sound a lot more natural when you use them. Please feel free to contact me if you are looking to learn more sayings for day to day application.