Sorry to hear about your water cooling experience.
But look at the bright side, at least you did not have a $300 video card in there!
Make your watercooling system as simple as possible and the Less connections the less likely it will leak.
All my tubes are so tight I dont even need clamps but have them for backup. Right now Im running a 3 gallon bucket of water and Lysol to clean up tubes. Tubing has extensions on it to reach bucket and still no leaks.
Here is a pic of my simple setup:
http://www.chadandjodi.com/watercool/newwater.jpg
I would say make your setup a little more simple.
Your NB Does Not need to be watercooled!
Just get a Vantec all Copper cooling kit for it, cost $10.
Thats what I have and I run 210 FSB.
Your video card can be replaced with a $60 Nvidia TI4200 w/ 64 megs and they overclock nice. Thats the 64 meg ones.
www.newegg.com is a great place to buy from. very fast shipping.
__________________
NF7-S Bios D1.8 218FSB X 11.5
1700+ DLT3C 0310 @ 2511Mhz
TwinMos 2x256 PC3200 BH-5
Albatron TI4800se 310/643
3dmark 15,110
3DMark2001SE Link