I have same concerns with my 2007 Sailfish. Dealer suggested a pressure test on tank while it was in for service. I forget what psi the test brought it up to and for how long, but it seemed pretty high to me. Anyway, it 'passed'. Service manager said that if there were any questionable spots on the tank, the test likely would have created a leak. So they tell me after the test.
So I'm hoping I'm good for another two years there and maybe I can think about a repower - if I can get over what is sure to be sticker shock.