Since, you are spending about $70k either way...just go for the 50i. You seem to gravitate towards the 50i, and the "smell" of filling with diesel seems to bother you. I find the smell of gasoline, to be not so lovely either!!