CONGRATS on your soon to be new baby! And, WELCOME to YT
. That's a decent kibble, so I def wouldn't change it...at least not right away when you want the puppy to adjust to a new home. If you feel like changing it, I'd wait a good 3+ weeks.
As for water, we give our dogs Gerber Nursery water, which adds some minerals back in. Many of us here give bottled water. Your kiddo will get a balanced diet (incl minerals) from his kibble.