Yeah, I would leave the water with him - and put up with the mistakes.
Another thing you can do when you're home is tether him to you, instead of re-crating him. That way, he learns how to be in/around the house without peeing. That may be a learning opportunity - and he can also be with his Mama.
