I don't see a serious problem with the noise. . . yet! The tank seems to be doing it's job OK so I wouldn't replace it. You may want to consider installing a Cycle Stop Valve www.cyclestopvalve.com. It's not expensive and it may reduce the noise and it will give you constant pressure like city water pressure. If and when you ever replace your tank, consider installing a CSV and a smaller tank if you like.