We do too much around town stop / start driving so diesel isn't really an option for us. MPG isn't a huge issue because we're not covering a lot of miles. It'll be petrol or hybrid for me next time I change the car.
I think maybe diesel has reached its peak and we will gradually see petrol turbo and hybrid cars becoming more popular. Think you are right about tax on diesel.