Especially up here in the mountains, I would agree that a TDI is better than a hybrid. But for city driving your hybrid should be fine.

One advantage to a diesel is that you can run it off of a plethora of fuels (including used oil if you have to). So they make good TEOTWAWKI vehicles.

Down side is they stink.