I think a short commute like that everyday would sure cause issues with a DPF filter as it wouldn't get hot enough, so i would say a petrol may be best!

Hoping i wont have that issue with a commute of around 25 miles!
 
Colour might not be to everyone's taste but just seen this on the bay 350997067095 item number.
Not my car and nothing to do with me.