It's your choice, I can only repeat what I have already said " I would deal with the matter when the time comes " I dare say no matter what you fix it's likely appraiser from Nissan will still find something, therefore I would fix nil knowing I have $1800.to bargain with. " and they will bargain if you put up a fight "

I note you may be getting another vehicle from dealer ?, in such case you negotiate for a new vehicle and then want lease return included to be dealers responsibility , the dealer can fix vehicle at a much less cost than you can.

If you want to play the game and " try to " hang on much of your Insurance money there are ways and steps to follow, it's hard to explain via e-mail, if want to consider how you may approch this angle e-mail your phone number and best time to call.