It isn't guaranteed that I would upgrade in 2 years, but certainly likely. Thanks for your advice! This is the first I've heard about a different heater in the S, I will have to research that. My drive is about 25 miles each way, but I do have an L2 charger at work if necessary.