If you went with the 60 kWh Model S, your payment would only go up $130, INCLUDING gas. If you're spending $350 a month in gas, you'd actually save money over your Infinity.
I'm not worried about going with the smaller pack; it only takes 90 seconds to swap it with a new, higher capacity pack down the road.