Hi Sean, we've just done a Q7 with the same engine & faults. We tried new motors first but it turned out to be the useless plastic quides in the manifolds. Had to change the complete manifold with new motors attached (fortunately our local TPS took back the motors we had tried) You can't buy just the manifolds without the motors fitted. Not too bad to change. Didn't have to update software, just cleared the codes. Hope this helps. Ian.