I mean... that really up to why you're getting the car and what you value... Personally I'm getting the AWD because the cost for the performance gain (especially staying planted while accelerating in curves) seems worthwhile to me (and the cost/gain ratio on the P, not so much, to me at least...if I were likely to be (non-drag strip) racing the car on a track a lot though I'd probably get the P).
I don't really care a ton about range, it's rare I'd need to drive more than 100 miles on a typical day, and MAYBE 150-200 on a non-typical one, and anything longer is a road trip that will involve superchargers... so the ~8% range difference doesn't matter to me but might matter a lot to others...
But if someone doesn't really care about performance as much, or max range is vital, the RWD is cheaper and goes longer between charges.
From your original question about it though it sounds like you want AWD for exactly the same reasons I do... (plus since you're adding EAP and FSD you're saving a few grand getting em on a "new" order instead of adding to a post-delivery car)
So the other thing is- do you have enough tax liability to take TWO tax credits in the same year?
If so it seems a no brainer to sell the RWD since you can likely get most of your net cost on that car back to put toward the AWD... if not you have to consider that in your math.