Just to follow up on this, ended up test driving again all day Monday and honestly apart from engine power the d22 won in every other regard including comfort and road noise (why do all d40's seem to have injector rattle, would drive me nuts!)
So I got a 2012 d22 with 120,000km, immaculate, well...