Great story. Just beware, you are adding some failure points to the system when you add a pee valve. I had a major malfunction with mine this year:
I had just finished a long decompression dive off the coast, got back to the dock, and grabbed lunch w/ the girlfriend. In the middle of lunch, I went to the bathroom (keep in mind, I was still wearing my catheter). I belly up to the urinal, unzip, and do my thing. As I'm staring at the wall I started to experience a very odd sensation immediately coupled with a sinking feeling in my stomach. I looked down just in time to see a quickly inflating catheter just explode, sending its contents all over my shorts, wall, and floor. Catastrophic Catheter Failure. It was so absurd I had to laugh. At least until I realized I was in a bathroom inside a very crowded restaurant and would have to somehow sneak out of the place to change in the car without anyone noticing Captain Pissypants running by. I made it to the car, changed, and got back to my table w/o further incident. Be careful out there!