If you don't get a warranty extension, at least report this problem to the dealer in written in detail before your warranty gets over. At least you will have evidence of reporting a problem, so that if anything happens later, there is at least some chance that whole or part of the repair bill may be covered.

Just a suggestion. I am a great fan of written documentation!