dublib - sorry to hear of your heater issue. We are dealing with the same thing. Ours started leaking (apparently for a while) but didn't realize it until a couple days ago. Now, we're dealing with the moisture people, plumber, carpenter (to replace the rotted board (which is why we think it had been leaking a while), AND the insurance adjuster.
Feel for ya !! Wish hubby was still healthy (has severe COPD) so he could do the job and save us a ton of money.
And, like you, we went through this 5 years ago this month. Thought we wouldn't have to deal with this problem so soon.