I seriously doubt that any retail waterblocks will fit. OEM's tend to use proprietary mobos. They won't mount in a standard case and won't fit standard HS's....
I do agree that water is the extreme solution in this case. I would prefer that Dell just fix the issue but thats not going to happen. I have been asked to fix this and I will
I'll probably try some aftermarket heatsinks first.