Use a laundry basket in the bath tub for the baby. It keeps the baby and the toys in a small space. The baby is less likely to slip under the water or hit head on the hard side. After bath just lift and all the toys are in the basket!
Not that I have an empty closet, but i do like this."Closet Office" - Turn your un-used closet/reading nook into an office space. Maximize the little space with lots of shelving and storage *LIKE CORNER DESK/nook & shelving for office corner
The trouble with those shower caddies that hang from the shower head pipe is that you have only one showerhead. To get more space for your bath potions, hang another caddy on a cabinet knob. hanger screw, you can screw the knob into a stud.