Deanocamino
I hear you man. I really want to give rinsing a try as well. I'm just to chicken to do I think. So I commend you for doing it. I've been doing a lot of research and listening to the pod casts on this so I think I've got a plan for it. Let me run some of this by you and tell me if it makes sense and is worth trying.
First off, when are you going to brew again? Once you get all that yeast, you'll either need to prep it for long storage or use it up in a week or two.
Secondly, judging by what you are saying in your question, the jar with water, beer, and 1/2 of yeast on it is probably your best bet. (How did you go about getting your yeast out?)
From there, I would just pour off the water/beer one and use that yeast. I say that because you've let these sit for over a day now. Usually what you want to do is mix up the cake with some water, get it into the jars, and after 15 minutes or so, pour that solution into another jar. During those first 15 minutes the trub pieces will fall to the bottom of the jar.
Now you would wait for some of the yeast to settle out or you could make a starter with that solution.
HOWEVER, just judging what you've posted here, I'd use the second option of beer, water, and yeast, pour that beer/water off and use the yeast to make a starter.
Of course, this is my two cents. I have no real experience doing it. I have read a bit about it though and know how it should theoretically work.
You of course are past this point, but did you see this?
http://www.homebrewtalk.com/f163/yeast- ... ted-41768/Let me know if this helps. I don't normally step in when I have no working experience. But since I've been researching this a lot, plus no one else was pointing you in a direction, I thought I'd step in.
Good luck!