I went thru that debate.
I was coming from a 2016 Model S 90D. Chose the Plaid and got it last month
For me, I like the performance upgrade and am happy with my choice
For you, sounds like a couple cosmetic upgrades the the regular S should do the trick
Good Luck!