Cheers! I think the area for real development for now is not in engines but in weight. Cars are just too heavy. Kill the weight and you can improve performance and economy. Hybrids are a folly due to their weight, complexity, poor green credentials (manufacture) and are also being pushed due to the way they can give great test results but again in the real world rarely match up to the claims.
I think this scandal points to diesel having reached it's limit in terms of development for clean running. In fact, it had probably reached it sometime ago and the dpf, adblue etc were sticking plasters. Governments are as much to blame for having encouraged manufacturers to develop diesel by creating demand through taxation, not that this excuses VW for their actions. I will be amazed if other manufacturers don't become implicated in similar tactics soon.
I've actually recently bought a new Golf but as I don't do many miles and can afford to be choosy, I bought a petrol. The economy so far is excellent for the type of car but certainly doesn't match up to the published figures. However I never expected to be able to replicate laboratory conditions in the real world.
Book it Tenjiso, it'll give your training more focus, although it sounds like things are going very well thus far! Do you have any time goals at present or just concentrating on getting back on track (pun unintended)?