I'd go for the diesel too.
Hybrids are good for the environment, but not as great as most people think for your wallet... Higher up front cost, higher cost for maintenance, and then there's the whole battery replacement that costs a few grand every x number of years.
In the end, there's not much difference in owning a hybrid vs a gasoline-sipper. (Financially speaking)
If you want another Diesel option...