It's difficult/impossible to tell someone what makes them happy, but that sure doesn't sound like enough grease for the hinge on my wallet.
Limiting charging speed just means your long trips (that require supercharging) will take a few minutes longer. Less range means you might have to make a stop. I don't think these are even 1st world problems - maybe 0.1 world problems. Free supercharging isn't worth that much from a dollar perspective, and supercharging a lot may lead to quicker degradation. I don't have free supercharging, and even though I've taken my car on several road trips long enough to need it, I've shelled out $77.90 for about 900 miles of range. A good chunk of those were on its 750 mile maiden voyage back home. Maybe worth a couple hundred bucks total over the course of a year? Peanuts compared to a $16k upgrade.
That said, I didn't need to buy my first Model S either. Even if all goes well, I will still piss away a lot more money in depreciation in 3 years than an Accord, but it's not always about making financial sense if you can afford it and you think you'll get that much enjoyment out of it.
Yes, that i why i'm so undecided... at times i almost have no doubts that the "swap" is worth it, but then i almost have no doubts i should just keep my S85, haha