I'm in the same position as you are although my 2.2 has given up almost completely. As long as you stay with an m54 type engine (2.2 2.5 3.0) the swap is fairly straight forward. The problem is trying to find a good engine!