Have an early 2013 S60. Option 2 would be great if upgrading from 60 kWh to 100 kWh was more favorable in terms of cost.
On the other hand, a new S would have some of the features not offered/purchased in the vehicle originally (AWD, collision avoidance, blind spot/lane departure warning, parking sensors). Did not order the tech package and miss not having GPS. IMO, it should not have been bundled into tech package.
If you have Sound Stuido (Now called Ultra HiFi) you can upgrade to GOS/Nav for $1000. I did it once in a 2013 S 85. If you don’t have Sound Stuido then you need to replace the center screen which cost $6,000 at the time.