All sounds good!
By robust, I mean it can bounce back after a drop. It's not a one-way track to no milk even if your supply does drop. The amount he takes will decrease as he takes in more food, and so your supply will also drop accordingly, but that is entirely normal and to be expected.
Too bad about the bath! I'm sure you can find another way of doing it, though. Hope it passes soon.