Since you do quite small trips and not a lot of km a year I think a petrol engine would be more suitable for you than a diesel. The diesel won't like very much being started from cold every day for "only" 17km.
And I would also pay attention to weight first (short trips, level differences).
Aerodynamics are less important for you, and an aerodynamic car will give you less inner space
