Here is something I switched over the weekend.  Went to Harbor Freight and bought an oil change pan.  The standard drinking water unit drops in the pan.  I elevated it with a few blocks of wood.  It has  been a God send!  They don't dribble the water now down onto the shavings.  I'm still scooping the shavings out twice a day - but primarily for waste...not wet water clumps! 
Also, we are giving them as much outdoor time as possible.  Set up a pen with a tarp cover off their future hutch/coop area.  That saves on the shavings and mess.  Going on five weeks old now.