both are overpriced in my experience (sold my '01S 2-3 weeks ago for $2,500 less) but markets are somewhat local. I'd value the additional preventative maintenance as worth $2k to me, the additional mods at -$1. But that is my choice/taste.
My buyer didn't even drive the car, just said he listened to the obvious enthusiasm and knowledge and could tell the car had been taken care of. He got a good one.
I say #2 because it has been driven and maintained appropriately, several desirable preventative maintenance items have been done and I would value the car being stock because I could get it maintained if I need to anywhere.
Additionally, the US bumpers saved my car in a slight rear end collision, I'd like the bumperettes to be there although I'd have bumperplugs paint them to match. I'd also not like black as too hard to maintain. My Boxster was a driver and I've read to many laments from black car owners over polishing issues to be attracted to a car that looks dirty and requires constant attention to look nice.
The aero kit and muffler create a look/sound that doesn't appeal to me.
Having said all that, it is your $, your taste, your choice. Get a PPI on whatever you choose. I hope you enjoy your decision and its result as much as I did.