New report on Housatonic water recommends $31 million in fix