Engine transplant advice in ABT AS7

Hi everyone, I recently purchased an ABT AS7 version of the 2008 3.0 Q7 which is a BUG engine, truck has a lovely body kit and lots of ABT goodies but appears to have been over-mapped resulting in a catastrophic engine failure, my plan is to replace the complete unit with a low miles used one but they all seem to be from newer facelift models, although these later vehicles are still 3.0L V6 they offer lower emissions and higher output so I am left wandering if that is down to ancillaries and the basic block is the same, has anyone here had any experience of transplanting later units to earlier trucks ? thanks in advance Steve