I'm surprised this is still going on. I have a 2003, they replaced my tank, but the replacement was just as bad within weeks. My dealer used a knife and cut the paint out from inside the neck on the replacement tank. this guy was pretty steady with the knife and no trouble since. If they offer to fix it, you may want to take them up on that offer, on the condition if they make it bad, then you get a replacement. Good luck,