take the deal ------ you didnt want that water logged one anyway. Its all relative -- the newer full warranty (no water intrusion) you may pay more but in the end you get to keep the boat longer if that is your choice or if you trade it early it will be worth more.
Now with regards to when...