[heatmizr]

Sort of agree, except if you LOVE the car, and the motor, it might be a good call to put a new motor in it especially if the rest of the car is in fine shape. (I have exact same vehicle and its still in excellent shape).
The biggest issue won't be the cost if you go that route - it will be GETTING a new motor to spend your money on. Several folks here have been granted new motors as part of the ongoing class action suit but they are not expecting to get them for many months.
So there's that to consider.

I am thinking through the same thing, though I have no immediate concerns... I do love the vehicle, and would skip the gen in the middle and go for a new one IF I decided to give mine up - but only can afford a used/CPO of the new gen, so 2-3 years from now.