I think the newest version of minecraft (or possibly one of the snapshots) should fix water source block regeneration, even when deeper than 1. I just don't remember where I read it.
EVE Online characters:
Daedalus II ex-CEO TOGOA, Daedalus III slave of Daedalus II
Little Molok Asura Engineer
"Trying is the first step towards failiure" - Homer Simpson