Agreed Oliver, and nice work on the swap. However, I get 16.5 mpg with my2f on the highway and here in the US diesel costs about 20-25 percent more than petrol. This means that diesel and petrol costs about the same amount per mile, not factoring in the cost of the swap. Had I stayed in Australia I would undoubtedly have swapped out the petrol lump but here it simply does not make sense. I have a diesel in my wife's Jeep liberty (cherokee in Oz) and love it, but it costs just as much to drive as it's petrol counterpart.
Add to that our very cold winters and high altitude (I live higher than Kosciusko) and I have to plug it in three or four months of the year to get her to start smoothly.
16.5 mph? Wow. Is it stock or desmogged? I'm about 6 mph under that.