7-8 years shouldn't be at the end of its life expectancy, but you never know. You might have a bunch of sediment at the bottom that's making the noise when that thing fires up. Have you ever flushed it out? I'd do that before I ripped it out.
I've looked in to tankless heaters. IMO it's a great idea for new construction. Not so great to retro-fit one in.