Question about gear 2 warranty

I bought my gear 2 on september 9 last year, on june 2015 i had problems with it, the charging pins on the back of the watch were wearing off until one of the pins wore off completely and it wont charge, sent it in to samsung service and they replaced my watch, now im starting to have the same issue about the pins wearing off, can i file another service claim again, also today is the last day of my warranty which is a year, so I have a question, if i file the service claim today, will i still be covered by the warranty, even though samsung wont get my watch until ups deliver it to them, which is a few days away,by then my warranty will be expired, so will samsung go by the service claim date, or am I out of luck, thanks guys.