yea the D to D swap will work.. .

But i dont know bout that axle you want to change