Mark,
Are you still under warranty on your A.O. Smith? I had a gas one spring a leak 2 years ago and it was replaced under warranty. Just had to pay the labor.

I am curious about the tankless systems though.