I test drove a gas engine with a 1.8L Turbo 5 speed in it yesterday, and boy was it nice!
I haven't even stumbled upon any diesels, so I'm guessing there aren't many in my area. I did notice though that you can go 80 in 4th, and not even notice that there's a 5th gear waiting for you to try out!

So...we'll see!
Cheers,
Tim