Im going through the housebreaking woes also with 13 week Ginger. I pad the crate (its too big) with sheets and towels so she has limited movement.
I only keep her in there for a few hours at a time now.
About the water thing, Ill add this. I have rabbits I use for magic shows. Two hours before we are off to a show, I withdrawl the bunny's water. So far, my rabbit has never gone to the restroom while disappearing.