Personally, if I had the choice of two identical spec vehicles, I would now choose petrol over diesel.
As a low milage, short journey driver, I worry about possible problems with clogged DPF filters, failed ERG valves and other emissions nonsense on modern diesels.
With our T6.1 4 motion Ocean I had no choice other than diesel.
If I could get a petrol/plug-in hybrid to the same spec, then I would consider it although again I worry about the complexity of these systems. Not sure the benefit of a few miles in electric only mode charged up overnight on a cheap tariff and the boost to MPG/power from a hybrid justify the extra cost and complexity.