before your warrenty is up, go to the CSL and have an understanding with him, if have black and white is better in case halfway he quit, and tell them that since this problem occured before the warrenty period is up, and they havent been able to solve it, then that particular problem should be continued to be warrentied against despite your car age exceeding the overall warrenty period.
usually they are nice about such things so they'll allow it. you just have to bring it to their attention.