Honest question - wouldn't it be the same price or possibly cheaper to just buy an i3s? The bumper, fender flare, lights, paint, install... 5-6 grand no? And then you won't have the wider tires so that wouldn't look right.
If you bought a new one you'd get everything + the updated battery.
